From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756510AbbJUVvQ (ORCPT ); Wed, 21 Oct 2015 17:51:16 -0400 Received: from mail-bn1on0132.outbound.protection.outlook.com ([157.56.110.132]:42247 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756491AbbJUVvJ (ORCPT ); Wed, 21 Oct 2015 17:51:09 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=freescale.com; From: Han Xu To: CC: , , , , , , , , , , Subject: [PATCH v4 2/6] dmaengine: mxs: support i.MX7D and deep sleep mode Date: Wed, 21 Oct 2015 16:40:04 -0500 Message-ID: <1445463608-5836-3-git-send-email-b45815@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1445463608-5836-1-git-send-email-b45815@freescale.com> References: <1445463608-5836-1-git-send-email-b45815@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11OLC003;1:M/wxelJ4DjuT0gK6E2Nu5a09KGiwCS5x4px9wdfYAZURWs2TYw2XHnFog1aHt6HL67pQmpTg9Wq+jUyu8/TxFHaqOSQ3e8arsUPvKXPqCY+MxgqQhg41sqesxVPhP0QyMshu9OxtRVfdjQHF5aBkmX3HFFGLg8W3gUq7wQFXW/MXgvtD2peWBog43QI8E4yVJ2/xJC4KpS++A1WuqSxkaWm7wglL4slp79D4CkduwGD1j8Gty0ofzJar1TKndM0JkaQ/Q1sDVkjoH64SeJfTFvqvU/D3gxxp3vSjcpsA3eJptX0OAEAVw2tS3PrCxfub3N8GQLEeHPTtDF7Qx+a3Gg6oQJV3XNthE+UkOKNyjKskJNuaHMhAVBoqtqOaZS7fguDRRjDGDq6IdhIduOhF1Q== X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(33646002)(81156007)(5008740100001)(11100500001)(92566002)(6806005)(77096005)(5001920100001)(97736004)(5007970100001)(36756003)(105606002)(64706001)(106466001)(47776003)(2351001)(46102003)(229853001)(50466002)(50226001)(48376002)(19580395003)(85426001)(76176999)(50986999)(19580405001)(104016004)(87936001)(189998001)(2950100001)(5003940100001)(5001960100002)(110136002);DIR:OUT;SFP:1102;SCL:1;SRVR:DM2PR03MB558;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;DM2PR03MB558;2:pclhZ2HrxDz1s+sdljWVBUuGmgCJuEsGdqa9jjMB+M+MZNMfHZQJFKS9N4DsL/knWOwzYbAZXJAjxok3jHA8ERUyE8dYPDI8KPhDPtvHdsa+UNM8shtRuhNtMKX5QXmwBfA7o9QOYmGNAFs9vVhewTHHYm/liqAKKjdoRpYrwgA=;3:UezvUzyPK90B9wXvFSwv4X0W7okocgh4kjW8dyss8Pz/WhJEuV9TyyWaobZSYjnDSkAwOr1MBzJqbAYEn8gEXL8EDsrLlWOna5H5rUgtf2dp8diIAbNp1LNP1t/r+hSpduUOFfd5K7I9T9srxyUIjN8aU1YZu+lQeShmnrhv4UjR7AImwQRQIFeLpf7UWtq8GqSlpTfauFP/Ht+WJlhXs4vXn529Uv+Oc3Wk+iFqRjA=;25:9Vtr76ASxEzBykv46br0x37iOFRmCaFZleXV+Sjl0SjTDPsK+cPWsNznF+roFvaMG68+2Ky1Z+qaxTgD3eFvi0GcRhbnAWLnA6wnDMwvt5XkdHyocI0ZiY3DGmksTPibzGbGI+kEznHeLGa/bAqIUvKcmTiKG4pBOiueTXQ77F0vlXQSz5vO99teCj3kuVWN6yZsqNA2WMFSCzgntXVbck9JxuqXQNJqnL+H+CFYtrwxaro26e3VVeOlB38fI7hp X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB558; X-Microsoft-Exchange-Diagnostics: 1;DM2PR03MB558;20:Wx0suXQ6aEvtiHrGeq3jjM3M+Yea8PHZPtIg9L57HlbE1V+GSPlbgW0jTRwHJdcNcnzFJ7aVZx7+OycIHUULancLAumzeDfCY983k1A7kNIxx/Y4hvRQ9ZeiK+cxzz1JT6yedWVbACAjcBhq7iwf2jVbnIYt90rM9faYMSJcNRp1kqp+VlkLNTI6yigUdgYPOKTdbT74wJoFe8O9CUOiztGF8sUtVn3rZKVabVQc5sVFZekpq1Dp4fQAw0sGH0YjDGPuCPoUTfCd6N2VqeDTxnN8DX8yYhWR6P/3jsJR1ZTbSPMGd1LEHEB/58csMFkebeAvHy7QP0sSrAOBWKBd8Yp605lj8COKZAxd+opBftw=;4:rhwJN1J6kX4SLfaKg/V9p4DkUltTFdAx5bjeDVXcxgC/crmAIy48vtKihRViAnPp1R4blwvA+YFj1YVilRhJKXQkd5FHeQrGgZnVLyFgDZqZ2IPj1hevllRHvMNBQJau1RTz/Fg+mmI/80nt8419UjORlIfP4mQzwtHnWTOEqphc5jG7Iljehu7EPPT8NIeKSSv/ispzplG4MSDDy548wfO5NnvdKB9kKq8lOk+LI37mSJbtU5cuZENgPA9GjVRQNnfH6sw3MjL7aSGgA8CaEVz1GkLI/ObRmJjOk++38uj+c/mZYtGEnPOuGWV5IJYV7lGKnoAim+OxQ9mtI2McU83++mtEv3iZ40oW4wxk4Eq9bCEwrcx9YIgSPXUV0Po9 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(8121501046)(520078)(5005006)(3002001)(102115026);SRVR:DM2PR03MB558;BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB558; X-Forefront-PRVS: 073631BD3D X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM2PR03MB558;23:IOvYrCZ+3GStVjmX0bJRTj/C2KJYBBGRphNPWF2TtU?= =?us-ascii?Q?cQ6dX0wT0qSYxJlqXKww6IyYx/sGGD7q4pWgVWDDunhXyN9XTrwbEf8bINTz?= =?us-ascii?Q?vvPjHFCTm3Skjp5thmmLR/B2zZbnpqmWTcCy+kBOpI2V0m6mxzRFwVYGEq7D?= =?us-ascii?Q?TYvLRZgn8ab6w0a7WRf1CrQ5r0OEhh+7qW6KqY0jiTVaP0kJOFkwsNLb6b+N?= =?us-ascii?Q?Bm0vGrxrpy9NPryLi6EkAjA4e7bSiMVIgt/lBc0ENo3/K1KTyH0qiShcQAeb?= =?us-ascii?Q?pbpqN6kJVXQaJPM2Cg3oTs7gBNiARg0nkD7gp3TUoNaEyLSMpAxCGOi2gzoZ?= =?us-ascii?Q?mYrD2MNP9Abrx86jlgPfOJSYSZedrcVvKZhmw+fEXSruNtXbfu0qqwgkNiMp?= =?us-ascii?Q?bbPM+Ngf8BYPaykYx2mWsIJvxFatXyusN1EU9F8jNg4Kbxz9rThubIRlk4f4?= =?us-ascii?Q?JXRu1JZoWotnX/gWKysT/1BgsZA4EJzUbUv3Ui8iI+UxSgrgnFiAYLdsKRGR?= =?us-ascii?Q?eJpd50WFIvwnocrBSryOwIpOaWyK06fNapTfvJpSLQ9RmsZRrGkRh+K7qH6w?= =?us-ascii?Q?Dq1dp0b1U4XMZur4JdL5FlOssCnxaIn2qsUyHnfyNJzOxzsl6oadcEsQmfjo?= =?us-ascii?Q?ntDhAbXRked1kN4wrukF5l8ZPwzzt6Mji+Off0LKpvO8HuRFuYV/ug+YYujK?= =?us-ascii?Q?1Q7zHrWnuc7OyMrwBaK6MAVdtmC/IN0cfc7afph1c5WXDiczoLPaTbzuVvs4?= =?us-ascii?Q?d6FaQ2yhp8kQhlRtDWiUBclRixt+oyBDwEi9KcNpAbkmOOK09j8n+ThO67wL?= =?us-ascii?Q?aZ7wJjdglhROEjppBetnyA0DkeD7tSkhzjywHLKzrOLz+0iy2sbbsLWjImAa?= =?us-ascii?Q?LLVdPWtQYpcZeoxOkNYVxEvYZQ5HR9BJy01y6QHqXFksqZCwuZTmfIGrt+mW?= =?us-ascii?Q?jH0OQ5zV8RbCx4XUx51IBE2A2iO7XiwnarO9vXJNq7AuBiq9m+6G6rCfRGh/?= =?us-ascii?Q?IVGj1YSyvIKgQvD+VuDM85GpPxeZ/SC07X6PkiLcGSitg4jykBsHj30Qyric?= =?us-ascii?Q?1yaoGCxUJ+HHc8YVcf615XtL9EUGOfYnEfY4Bg22Y2XntTVg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM2PR03MB558;5:rk4VKXL+mrdBO7VVObfCpmPZTEkvb5Rdk+PkEcgfk2WwMSD5yEolsbM27er2Y2AqPmPhWYyYEOnDyv9MxAYxn7iNtGncDiMu0vOxOZ+oUrsLgwcxvou3PjCzng1yQxvZXpKdCN0qtWtKJ6AFOd7X2A==;24:XS3HHolW8ECdnBPhsN2snft8yrSjbi/GwfXQT30TJRxS0hdFQNLgc32prwYI2gV7UKFG/16FmmaHG6vu4oBrpVYhOM9BaEPBwH9bFgdl/K8=;20:ToOfdADopAKy4gj7xoqCX/e09G2XAB2LnNgs8L429VA1vG1gQvCQ9PDqMZMUsptxcTfF2m0rT9qc1TkW6PDb0A== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2015 21:51:06.1439 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR03MB558 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Huang Shijie The patch support i.MX7D platform by adding extra DMA clock. Deep Sleep Mode(dsm) turns off the power for APBH DMA module, add suspend/resume function and re-init the APBH DMA during resume. Signed-off-by: Huang Shijie Signed-off-by: Han Xu Signed-off-by: Adrian Alonso --- drivers/dma/mxs-dma.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 58 insertions(+), 6 deletions(-) diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c index 60de352..5be13ad 100644 --- a/drivers/dma/mxs-dma.c +++ b/drivers/dma/mxs-dma.c @@ -1,5 +1,5 @@ /* - * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2011-2015 Freescale Semiconductor, Inc. All Rights Reserved. * * Refer to drivers/dma/imx-sdma.c * @@ -28,7 +28,6 @@ #include #include #include - #include #include "dmaengine.h" @@ -135,6 +134,7 @@ enum mxs_dma_devtype { enum mxs_dma_id { IMX23_DMA, IMX28_DMA, + IMX7D_DMA, }; struct mxs_dma_engine { @@ -142,6 +142,7 @@ struct mxs_dma_engine { enum mxs_dma_devtype type; void __iomem *base; struct clk *clk; + struct clk *clk_io; struct dma_device dma_device; struct device_dma_parameters dma_parms; struct mxs_dma_chan mxs_chans[MXS_DMA_CHANNELS]; @@ -167,6 +168,9 @@ static struct mxs_dma_type mxs_dma_types[] = { }, { .id = IMX28_DMA, .type = MXS_DMA_APBX, + }, { + .id = IMX7D_DMA, + .type = MXS_DMA_APBH, } }; @@ -184,6 +188,9 @@ static const struct platform_device_id mxs_dma_ids[] = { .name = "imx28-dma-apbx", .driver_data = (kernel_ulong_t) &mxs_dma_types[3], }, { + .name = "imx7d-dma-apbh", + .driver_data = (kernel_ulong_t) &mxs_dma_types[4], + }, { /* end of list */ } }; @@ -193,6 +200,7 @@ static const struct of_device_id mxs_dma_dt_ids[] = { { .compatible = "fsl,imx23-dma-apbx", .data = &mxs_dma_ids[1], }, { .compatible = "fsl,imx28-dma-apbh", .data = &mxs_dma_ids[2], }, { .compatible = "fsl,imx28-dma-apbx", .data = &mxs_dma_ids[3], }, + { .compatible = "fsl,imx7d-dma-apbh", .data = &mxs_dma_ids[4], }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, mxs_dma_dt_ids); @@ -440,6 +448,12 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan) if (ret) goto err_clk; + if (mxs_dma->dev_id == IMX7D_DMA) { + ret = clk_prepare_enable(mxs_dma->clk_io); + if (ret) + goto err_clk_unprepare; + } + mxs_dma_reset_chan(chan); dma_async_tx_descriptor_init(&mxs_chan->desc, chan); @@ -450,6 +464,8 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan) return 0; +err_clk_unprepare: + clk_disable_unprepare(mxs_dma->clk); err_clk: free_irq(mxs_chan->chan_irq, mxs_dma); err_irq: @@ -471,6 +487,9 @@ static void mxs_dma_free_chan_resources(struct dma_chan *chan) dma_free_coherent(mxs_dma->dma_device.dev, CCW_BLOCK_SIZE, mxs_chan->ccw, mxs_chan->ccw_phys); + if (mxs_dma->dev_id == IMX7D_DMA) + clk_disable_unprepare(mxs_dma->clk_io); + clk_disable_unprepare(mxs_dma->clk); } @@ -693,7 +712,7 @@ static enum dma_status mxs_dma_tx_status(struct dma_chan *chan, return mxs_chan->status; } -static int __init mxs_dma_init(struct mxs_dma_engine *mxs_dma) +static int mxs_dma_init(struct mxs_dma_engine *mxs_dma) { int ret; @@ -701,6 +720,12 @@ static int __init mxs_dma_init(struct mxs_dma_engine *mxs_dma) if (ret) return ret; + if (mxs_dma->dev_id == IMX7D_DMA) { + ret = clk_prepare_enable(mxs_dma->clk_io); + if (ret) + goto err_out; + } + ret = stmp_reset_block(mxs_dma->base); if (ret) goto err_out; @@ -803,9 +828,19 @@ static int __init mxs_dma_probe(struct platform_device *pdev) if (IS_ERR(mxs_dma->base)) return PTR_ERR(mxs_dma->base); - mxs_dma->clk = devm_clk_get(&pdev->dev, NULL); - if (IS_ERR(mxs_dma->clk)) - return PTR_ERR(mxs_dma->clk); + if (mxs_dma->dev_id == IMX7D_DMA) { + mxs_dma->clk = devm_clk_get(&pdev->dev, "dma_apbh_bch"); + if (IS_ERR(mxs_dma->clk)) + return PTR_ERR(mxs_dma->clk); + mxs_dma->clk_io = devm_clk_get(&pdev->dev, "dma_apbh_io"); + if (IS_ERR(mxs_dma->clk_io)) + return PTR_ERR(mxs_dma->clk_io); + + } else { + mxs_dma->clk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(mxs_dma->clk)) + return PTR_ERR(mxs_dma->clk); + } dma_cap_set(DMA_SLAVE, mxs_dma->dma_device.cap_mask); dma_cap_set(DMA_CYCLIC, mxs_dma->dma_device.cap_mask); @@ -835,6 +870,7 @@ static int __init mxs_dma_probe(struct platform_device *pdev) mxs_dma->pdev = pdev; mxs_dma->dma_device.dev = &pdev->dev; + dev_set_drvdata(&pdev->dev, mxs_dma); /* mxs_dma gets 65535 bytes maximum sg size */ mxs_dma->dma_device.dev->dma_parms = &mxs_dma->dma_parms; @@ -872,9 +908,25 @@ static int __init mxs_dma_probe(struct platform_device *pdev) return 0; } +static int mxs_dma_pm_resume(struct device *dev) +{ + struct mxs_dma_engine *mxs_dma = dev_get_drvdata(dev); + int ret; + + ret = mxs_dma_init(mxs_dma); + if (ret) + return ret; + return 0; +} + +static const struct dev_pm_ops mxs_dma_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(NULL, mxs_dma_pm_resume) +}; + static struct platform_driver mxs_dma_driver = { .driver = { .name = "mxs-dma", + .pm = &mxs_dma_pm_ops, .of_match_table = mxs_dma_dt_ids, }, .id_table = mxs_dma_ids, -- 1.9.1