From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754129AbbIIWqw (ORCPT ); Wed, 9 Sep 2015 18:46:52 -0400 Received: from mail-bn1on0139.outbound.protection.outlook.com ([157.56.110.139]:45039 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752893AbbIIWqs (ORCPT ); Wed, 9 Sep 2015 18:46:48 -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, 9 Sep 2015 17:37:20 -0500 Message-ID: <1441838244-2106-3-git-send-email-b45815@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1441838244-2106-1-git-send-email-b45815@freescale.com> References: <1441838244-2106-1-git-send-email-b45815@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD021;1:JHRwd1uK808cjEL6xgSuvFo/5ASo12QyJ8zJ+W3kQRXBoEAHWmxneoJraI4sq93HmjdvvGse6274bLN2WwTxfEwccLj/wIwePMgyZZKpzTRHdHKJfbtS6mEq+sOavtZ8pw/leQmAW2FtdMZ+EypoUnv1/atK/oSKrHMZUPeJD6hshjQvz58jc6veqEhIi79Oi9ljkCF3lgjNS/PlTturSoCt1qBMNuhjTdpuT7wqgbbhL9x6cWLtYRWB9nxVbbwxZBRV69dM+x93qWMYS4TblxqD4XwGgN2NO1buQuijoYMHB5G1BkbQEZGdxGkWH1/LD8FaGrdGedTNwX+bN3geFnngwUK8m1oI32COa+XdJPQbv4eyp9Ic2TtwZ71MC0mG5Fwlo19OPHZYeDeihThEMQ== X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(2351001)(85426001)(46102003)(5007970100001)(11100500001)(87936001)(6806004)(62966003)(64706001)(68736005)(50466002)(229853001)(2950100001)(50986999)(5001960100002)(105606002)(50226001)(48376002)(5001860100001)(92566002)(77096005)(5001830100001)(5001920100001)(19580395003)(76176999)(77156002)(36756003)(47776003)(4001540100001)(189998001)(110136002)(33646002)(19580405001)(97736004)(104016003)(81156007)(5003940100001)(106466001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM2PR03MB559;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;DM2PR03MB559;2:NS1e9eOTdypceS/gBTjanzjui+ilIXx1It594vtlCSeh6judClaagZq7cuWUxh/J8XRwCEusYcFaUT77HJ1MyNTsFcN5X8Pa339TOdawMmbZYm7onfwoAg448SoX6SYBcF86Y3ahI90Gnub4NukD5aQ/jTX4kxOem/Y1UlGP7CE=;3:B8BGoOTfKj2rtNpzLVjNil8o75h0bkkVsTM2dR9jDtKoZSHx0atYNWz5Ya8Pc9SKna7syJC/4DHI+bF55/AjMc1NkRhzJ+38ZVN/ygrd0c3gh/uTJisg1xLkqVPihH3mg0MRJukKkW0yEUsR/WWbR4NbkNiOeOdac3RRSmO+ika57H4PsKvg+mJE6ZPpM3r0qhConPrDwq+rmIPBUPAtdk/+7nB3jqUhQ844UELwSRs=;25:0LHqBn1fm4xdTRpNdPA2yns34VJDOc4spQ+6UmKKP56wkJbE1KS1pwoqzzflQjPBaCvEbbAu/+B1PvBo80CvFJVtDHBR7HCaYAXKCmmSoid/Z79iOHjGRuN5FGh6tKTWlt/mBflY2S+hxoOIt6Pt0XKNO7YTgBFdksj+J7DPIzybTgMNHrLoXUlDfsJ2hICvBf8AqUsBIORTxbJEqtyoyZEqmUPVyQHANgl4/ecMZNOFhUjWPLotYDC0+279qb57 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB559; X-Microsoft-Exchange-Diagnostics: 1;DM2PR03MB559;20:3e7RsSSxeMDMlmyaTTujreLoR8nd9QHVtNGke2GbM5lNsSrY0bVrSKvu1273Ig+yzA3/sPJ2jlAnUAuSIv6N2YwBkFwtkDeM1BKkCCO97mvrvG7WLh7CWTGkTGSsE5kFD8D/5rLaWSlDF/UXLmrSYXg5asZH8aH97De+pQJawf8sw9NLX8F6l8PBBLqNIPR/wcljgnhy5mRYZp/99rymi2LTI+5r1BvgSrQYB9Q7swSapT0r8ep8tTbqoN31FKDbpWh7hKOHVtSMrkq4SlCSGUPs4SJgpu/az0Lwi3AUIepd6qov6/kXVgv+dUKRyLskC41uYTRITm9GYbcwPMyBs8TsckZeOYuPS4fpSdyMbTQ=;4:KMFFA37MeLX6XhxEAnCKa0Ygh+4E4PMFksOcPX9nps7q+1juFELooC47XQyglLZjTsDi3uAuGumQp3e/5Wb0CaD+HOrKQT9rUTKei06qIcCYbeznnJ7BfTK/6Y/NW44mmpRWZqNsCZPhiwew3BVVbHAbngg1TpENnq3UOfxu/WU/SNxs3HqgsJH64nBM5oRklnrtP0kE7P0KMRHrmEvTxz7F7nzBsdsl0hw0PFBXGpcWNQPL1KoeJvRYVjZ9xwcYl7EEv+PPe3KvwnBoSbPhRwwh87U7EcnBEAIyTxix40HvlHOQIfxEXmDj2ETNsAGa X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5005006)(8121501046)(3002001);SRVR:DM2PR03MB559;BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB559; X-Forefront-PRVS: 0694C54398 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM2PR03MB559;23:sTYEswV471f++lXAUdnKUdBeoD3V16fl3+BUdYD26q?= =?us-ascii?Q?7mP681DljFgcpIWTOynS8rDZievkYJyLpTFN/vYPiDFok2z+XLjdcAykv/pJ?= =?us-ascii?Q?nbzTnOv7IUX3OtdbvP92VfncM7drtxj3Y8ZcoCFZXt5ULv51LgN7pLcqJYSY?= =?us-ascii?Q?5S0x/ZlMllRPxtQ4wGhGgxUpV6b3kIVui9z4pFTnjFAW5+2topo5MMK4PsVl?= =?us-ascii?Q?LuSFCa40LfrBtzY4Od99YOgy+ju8luPBsKx0VFuSr4ScbDP4Cs+Qyd7nciTv?= =?us-ascii?Q?AbvrRQKnf/UreM8a6wAZ68I/FnKWnwwwmjnkztBfglFcC0EZmp1+6/qXWhty?= =?us-ascii?Q?7rYD/2pKqSRAcx6+kdsx5rYCENxdBxMbc6DryolwXNEN6CPIXhX0yyYGKV/C?= =?us-ascii?Q?3T3Kd/beSiUMaB2nvLwh3nYlmaAMBEwnffq+1O2cm8TFWRJR99PZFKpI5Ozu?= =?us-ascii?Q?6w7WJQWW582JovBifPv84h7dsTrXWcGGIVHp3aTLmmVGYzTd8zJ9R/BqQOqJ?= =?us-ascii?Q?kMps5BjqYNeQv7Edf8QhCKrX9+42Iomg8gigel+nJd3carmKEnbWK59tOj1P?= =?us-ascii?Q?zOf49I3XeE2rZLdH4DUKkmp7SK4ywL+eZTPK2xZ/RgCzYHg+vktrCVqYx5ME?= =?us-ascii?Q?KomLVtLayso2TlX6qPXzPN/r/0H3fUw7o2uLPlV9xjF1gkPCbBYh/BvvBQZk?= =?us-ascii?Q?sqB9gzbXC8ujBQnmhCHiUyoC9JzK9rQ0qqFRFOu9NrJNp84ViPFgFy99q2W6?= =?us-ascii?Q?ef/lrTegrMue7BHDS8gYZH45TQcRc0kB+pgf2XSQ35Ug9hBYnnlHw5UoTXUX?= =?us-ascii?Q?HRo5Ie3dIxy1LHPDeWsz9cSRaMUvDnQAEEdbt1pQz78CAGNHGgfYQq5MzoOq?= =?us-ascii?Q?+UJ9IXYBvdjo1jcpv6FLmBYwLem/+e9gBkMMKuxKGA7Cv2+4Cj3g97yzGbjS?= =?us-ascii?Q?K3QsNpWjYuzlNot5D2raTj6LpQ+4SRKfiWLuYuXcPuMGKTaLjyDsQ+pHd57y?= =?us-ascii?Q?Tk+NnWCodUsizgNP3U48n/avFbGjtEjxAFj2Kd+3x+sw16hHNN9XJvJIvgD4?= =?us-ascii?Q?IwY07/fAKbj0HoMOedzU/VY/Yt8/2RzdtgdjJ3AVEJpx82Gu5VVGOwSL4fhu?= =?us-ascii?Q?DaMrvBf14izYWZo9RDbvULAkrdfiCLza4LrXLS/jRWfdo2D2ATGE7ACzbW/J?= =?us-ascii?Q?aeABpnt/yPo6tOraMq0StZC2bYGvIt15rAlrh6hwiGbIhwcFnK6xB9Og=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM2PR03MB559;5:7vAOq06vnWsosnJH/yssHYlXm+oJfe3vBI+GOqhkB0Q2wCLrsu01QMWjIkEbDW3+AK9RjY1dXfFjOgdl9iLv3XPQgICu4oWphjcS8kwwz1A1EI0PI3LlyHlx28VK74rEFDf35jj+NC3fTgpzKckI7w==;24:TzBSTkx0SvheRSilewRXbgsnAfrWokoAyINtigMVpTJABm2vky9dQ+qTjEISylQxTL/szGTvvS7PzwJVt/2yrIBl6paM+9RMlKwwQC8Xh2k=;20:lAZi8z+NyGU2e37k02d1k8Qzpd8bcxPr+UoPjlr93BINLPhQer1RoJi7Oln6DkzAB3OhrfW8y8m77pItGDCfYg== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2015 22:46:46.3040 (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: DM2PR03MB559 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