From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752210AbbHRDdU (ORCPT ); Mon, 17 Aug 2015 23:33:20 -0400 Received: from mail-by2on0137.outbound.protection.outlook.com ([207.46.100.137]:54251 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751769AbbHRDdQ (ORCPT ); Mon, 17 Aug 2015 23:33:16 -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; From: Han Xu To: CC: , , , , , , , , , , Subject: [PATCH v2 2/6] dmaengine: mxs: support i.MX7D and deep sleep mode Date: Mon, 17 Aug 2015 22:24:43 -0500 Message-ID: <1439868283-24796-1-git-send-email-b45815@freescale.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11OLC012;1:rIxGuW3tFX+PulHUQBU0nq04Yh/MNJijmT9cOi8PWhoq1NgtwZ0o5nH0xsNipZqCgRWUy7WmX9OdRM4JoPfH/ihzhsR8VWaRXQuNjy5jfAmDJ4shxk9RjLIqg5V80U+YHbmucnuPjRgG3H0ATV8i0qPa02g3XGdLRVDcRE7s2ETHEeZjRE8VENDNMO2G0jZwxNM81+ywUmtdvi7saXszBLjPf36oM4J0HBg0iBWZMsQU3Do+iJxt5/ccGOA9NMGtR709q0g4aXeQSX0Ji46XGvyLUZRJiY6G7DmbCLbL5vesh2e5Wi/pV70Vh4kXaUEhtVaKCZwoLQ/j6Sw8B1jau1qfvi0osw+P/N5QjoCmLFVX8mWpQgSdsAZBPKKjs7TdXxshKrEvgR9fG+tLZ5dq6w== X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(339900001)(3050300001)(199003)(189002)(46102003)(4001540100001)(19580395003)(92566002)(81156007)(97736004)(48376002)(189998001)(5001960100002)(50986999)(5001860100001)(2351001)(5001830100001)(19580405001)(50466002)(6806004)(110136002)(50226001)(62966003)(105606002)(77156002)(77096005)(85426001)(64706001)(87936001)(5003940100001)(68736005)(33646002)(104016003)(47776003)(36756003)(106466001)(229853001);DIR:OUT;SFP:1102;SCL:1;SRVR:BLUPR03MB551;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;BLUPR03MB551;2:Xzi/1Va+R5xq19/2DAxyk+syENB3YAKjEuFbsxI6ximrAK2RkE0wneeU/gIV48jsuOA5IZjQ1vCZYbr/3fmDOeucsIMmGY+pYGcCXb35oDXT4p6HgHpgq/t29gSVV7GGGLteMYAwzXzh4N8M1CFx1htGpnc7313Njsbp0Jr77CM=;3:Gy0pe4ykVXtaVgxHH389fhDoWZ6vfVcczx4IRSpM2tJIMeiyf9a6/tqPFpuPJqIVTFMtb+bC65ClKEPq+D7OWMm6I1FDwCw0hBoczhkFsBFVqpmXfrufl7BNqCoXMvL0kVfvMd1YePgmxgy8W1i03bufBhVj4ABEG+9mok58A4EatGRq6v0m94v3BC00ialBjshBE5GO91SbnOumZ/NrbHCYdR/3ki5ikspSYHPUlZU=;25:FHFOKDWw86k3N5lGMRifsXbkOjoB0oo88nMbk2JqM7A/dH1psxQagAJq8F8lidYbpc02YH307bw5lr972jZkHZozJzvAwBE2jkXqK9gp+NBYTgjbB9RWxZ3hj7Mqbn/3G8EIx9nYtLj3r1p14Ci8EbH1IvDbwiKlgCrl1Gtv2+jFhLmRmTaPCtPIvN5qgQh4kR0m/QF8ZECich6++nCTIavlAe9OwS2wiH5Ug9aj1vbySF0qSC9zBwIAXaeFY7UT X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB551; X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB551;20:IZoU3CZuCYwUtday7D9DlGfzZDZx+j0xX/k9/bzOkxsC+VbbSh8ODMgU3MDcz5vrApWHbIgX5KepG/B7e1c338Rw9jjvSp6VcLUCLuQJdQMgkkik4nl1614xk5so+yhbUFeT2RW96fa6utcs8HyZX+XMVf+5hz3HGZ/QjcG8YBnAsDlBcKTa39NToLtAl7igN2ASEJPtEDlqwuFLViVWcqW9U+mIIjRU6z8UkXRjIVvRlXCTw220dk+LFh7i1as25oVCZCDvXbtfIaLp0CEW3GSMJReVfFqnKd8kWFEPwqXLEbasg1A3Co5LKTRXwkwrhBg8Nh0nTScmJxeV/R3RuNnSmF0vjjaoBeANjAuLBYA=;4:QLNVwpkFMdrx3K29b+nfl8Y43miPhDIbGKORAtKiPK/2GtlHU14MtCGRvCsYb7G1Xg3aSbWWdbrhVIAYctgVNa4cGmJvsaYeMmfN0w/iB4y31Gj2JFCxh6IaM0dN61sKawpqELNmCMpTA4pw6js5Q2C4d0Hv0btvEdsnlva/6kpZEs5VwLEvjNHhOBnW82uSPUD5uyhzOQr7ClKXtlVGHtNbKCsT4Pw/IKQzxWndYL3Jh+acywLWKxedYBeNqQdm6NGkGrJKBeztTB2JKblGW/o1ovfFCh9Y1G4epqNqhWSwGSysVJ+GZ6dHIEoskwYL X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(8121501046)(5005006)(3002001);SRVR:BLUPR03MB551;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB551; X-Forefront-PRVS: 067270ECAF X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BLUPR03MB551;23:Ii2XLCAeKYQmh0cw9J98+rOwylanDycKTzLgkjuNqt?= =?us-ascii?Q?OXO29gS+/6w6ekhMkLFlsS2Hf09p1JMXu/6zh1kc5HQLkJ3Nxqy+t9JjN0Nv?= =?us-ascii?Q?Ly8J2H1OMyj9uXtjL2Nteg6Ysm370414c9fNAWjsyLnHfa6VjTzU+1r1/ZP/?= =?us-ascii?Q?Qn9BdveoEHCW8PRjhbaG9/NpluSJm8/sMlR+rdbj1pv07n6cBVQY2+9Hg/l3?= =?us-ascii?Q?KHZrvZCpeJbTFCBvY/tEQCjm/xsQTZxC3Om5lx95KLcFxlQ6uWHjFMVJ6/rT?= =?us-ascii?Q?kzeI05bXQlPDPtggmJ63dXNLo9txos1BvMj9E2t2Tjmg5zQkN8NAMwT62qk2?= =?us-ascii?Q?vu2qbcYmlOmFJVFDJHJVpWsevPhH7Wyebl+GorRatqkgCDGeXSbfrxFkZVgR?= =?us-ascii?Q?yUbHefPzkAuP5i9IJq6KP2oZV4bKZI2QWkaMorxV5/CmmnjF8L3CPw6S1Avw?= =?us-ascii?Q?5birochI/koYQ2Yr3WTCFkXnYWzwl9mFVyKKCtOH9wxg5avcoeinJ4V9Jilf?= =?us-ascii?Q?Nz9n1ly3B3xsuZ9SgljZp7pAP4OmD6j0Dfnp11i3O1Ps65gfBRQ3Isnoav2i?= =?us-ascii?Q?CzaP1bER8ASB4y3tAJ2UKuIR786w6q91tyXi85LoTT4YYPBGcd9xrx0EVgHo?= =?us-ascii?Q?ckz5wKKDvuDwmoR8nzqzF3JK35Wv3V/5nMAuQ+y//ImMFsvm4fPtmB7TnWtD?= =?us-ascii?Q?tt/VUp8ETj+U4+SKVnpGbOQsqO8YRy6y4FI2i4dNUPdPQFQNLHxfB1uWbw9J?= =?us-ascii?Q?QyNX27fHDfDyv8wQnvxZVcuK2SZNID2sKrVAoUE0nByu1bnh6dLpJp3KI6gP?= =?us-ascii?Q?+RMvdZ/tU+ce6BOu+DE6aH0783qJoTwKAKj15f+H0gLYGc2FJzruV2klXC6n?= =?us-ascii?Q?xMOPMH3q4NuzcWlP9kG5th2837sw1DB35aHquUJZzetUtQdc5GUi6F/Csz3g?= =?us-ascii?Q?vTeFBGYWSnQkuJKvVAVf92sYyPgQ1VEqkryjxx1Xmxjcs6mAQmnuLqB6QsKx?= =?us-ascii?Q?SBkRR146+yB0tQ9nYOaznxAHerkeG2Pnh88o/W4YosI5nKjILamp1Uwb/zgJ?= =?us-ascii?Q?jpnV4SRtCRPg1RVGORLMcglTBJ?= X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB551;5:sDKem5v373zqobsLBe+MwM019P01k6NVSkcs7HLClo/sQJzDEZ83YqlV92XTedajCARjmL1Ulat49IfSuNctojph3Ht5n4KsTgpzvGmCrVs4wwzDEQszIXNiyXFFRGC5hhp4mEc0dlWfcoIIBvUPRQ==;24:oAWRKVCCoraFKiy9TWcTveZqIKO1raH5VvcjGlWUzE1U8KgaIj940YP23IXpWcFwNNVW+MeMb16AofeXnJBXs/meKOsiOZDLTcAyTK6L9e4=;20:eHlSMHCGCnIejEMo/Mcgs9qqBVOp5V2xbam0o+zXlEjB6OInKBhVXnT4Paq0+WZQ89BcW5F6sOAvCtgmtX8C5g== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2015 03:33:12.5971 (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: BLUPR03MB551 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 | 73 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 67 insertions(+), 6 deletions(-) diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c index 60de352..2b0915d 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,34 @@ static int __init mxs_dma_probe(struct platform_device *pdev) return 0; } +static int mxs_dma_pm_suspend(struct device *dev) +{ + /* + * We do not save any registers here, since the gpmi will release its + * DMA channel. + */ + 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(mxs_dma_pm_suspend, 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