From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753643AbbG1TvM (ORCPT ); Tue, 28 Jul 2015 15:51:12 -0400 Received: from mail-by2on0111.outbound.protection.outlook.com ([207.46.100.111]:60032 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753366AbbG1TvI (ORCPT ); Tue, 28 Jul 2015 15:51:08 -0400 X-Greylist: delayed 6768 seconds by postgrey-1.27 at vger.kernel.org; Tue, 28 Jul 2015 15:51:08 EDT Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; lists.infradead.org; dkim=none (message not signed) header.d=none; From: Han Xu To: CC: , , , Subject: [PATCH 2/6] dmaengine: mxs: support i.MX7D and deep sleep mode Date: Tue, 28 Jul 2015 14:10:07 -0500 Message-ID: <1438110607-22551-1-git-send-email-b45815@freescale.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11OLC014;1:by6SMk560etVrbddQIUIrvI266ckd9zM5zWpJJqbQKTPbdw6vOV10hTDNoadwyS0DR0EpfdAKMP8BvFgNCt3wtOuQ1lk+wK5R1l6uIB1aMInFTPecLOhw0nEOFtLzXvOGrhh+N58uRX/UxG8MNHmnXWmo5x3AEPUMpTdaHyRZmHv1sM/lqSmLati5D1UnUU+8JmQg9pb66Trg8r/71zsR2f7JpJpTm3gJAkaLOC+3HGP+AtVfeqY8Sr0mvVud6ch4Rox/0c6FldBr1DGaJa9pBG/JxptmzE68lo8CinkPnnKntFAP7sSN9D1OHO2D5WYLA5sJzfeI/t3rcgBpt7+Dw== X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(339900001)(199003)(189002)(229853001)(106466001)(2351001)(62966003)(105606002)(92566002)(77156002)(77096005)(189998001)(36756003)(110136002)(5001960100002)(104016003)(33646002)(50986999)(50226001)(19580405001)(19580395003)(48376002)(87936001)(50466002)(6806004)(47776003)(46102003)(85426001);DIR:OUT;SFP:1102;SCL:1;SRVR:BY2PR03MB490;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;MLV:sfv;A:1;MX:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB490;2:vt+W0KgamtvO1UA9OPUrTUwpua4aAfDy6KMeWo/m3fU+Uk0UjdpvAicURaF8rHPFrU+84TVwLYabdZ2TmctYGyJQCcuhPhk1sAFc8AOmcrlexlMIRCmCC0LvDDSoe4S6tTrKjaoTFwZPBTUS0JZSmiNro4FMas6Rk7tgwIS/xhI=;3:+pPhrvA4unyfuDW8wlKvR+7ql6HTfOv+4vSxXKcxDbtK6bXef+h5OTXkzvwddvT2no60K2l6sC1JdEJL0oKgtl5uvb1akcn8KTyV+kAFE1aYXOj51fkC0OpRLmT1lYravg+0u9RFfVleiZeGaFH6p4GbyJwG1RvEd+u1f2eu18kICQRjzzDB6Iym9vgK2uDnZ+iq5QLFfZiHcPMaLb1+kA2xG/U2fRgB/PWIIs7Ykh8=;25:xNYqQE8MmKFz7tiAwH1q7/p6TFErSp7yywIm4nKrL+90AY0b5E95h3wHziTGKM/4g93vcIXUogjInQzG1WWXDD9El5P2F5KQk74n+V3XV3e41KpuI+99L1vinC+51OV1ErwCF07E0pD9tG9UARDKHMpVK8G5hcTIxIVky/HRlB10eQG4OudzFux/WVj1nBdJRQy5+BvYT573JeAyS6je9vDvHqAcr4ZZQWGyaODP6QxyXc3kQjmoblZGpLb7BWRd X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB490; X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB490;20:/kHjlbVLKwW9pHjjhVR3Op9yqtKewO+lHJCt4iW02cjkXfa4IHa2wM3EfD77qlBIvcNbLnX2XNqn9gQXJRT5UwVKPAFEee6bSMA2aRT2ZYqiIRDWBHBjZaGsy5bfcKeGloIcpDU2I1MlKUHjdoKm1m4oOdH6jQlfUmynumUD/WeL/6392lp9Xp6BYgw/mVUFvUK/9xOjMxZHXQm79wcK1lu8SWsUWmDkO25bYtTRnxYR7b1eciqSIhWQirj3l2W9LtpeXsgjbjV3srOmFVFBEJ5joCnVtuVcUfo1MCrR1DaSnUd9EkxRXjJUWJPfELJgMxSX/jeYRZgIg9Sksac7hXexmb2+AWGxLOn4/Kh3tQU=;4:H3p7wiBSpZQoH04akdTEbJBiPJOmxG1xmIg2HEzS5MEcyPa9wKHR3vKWmoNSNRH5ZEin3tzGp42xSTCSx2uvC2IL2yjIdGYzFY3ejxss6myHp4tag6NqB1VglVhiafCX1F/8bcGNXLkoqUAGITkbeuxCGdA4oHNzzWzQDEsiTfQpM4iOgmAaSQcYuxsGo+0Hlwu5mdhG53QZTh/5NpjrIlL9Zmq9HhQ+g9l0LoWnd9RvI6oEELSX7kW5/lN/L1Nng+KItkv3t0IOpGsmWuU8CsE9jlvgTdgTesZdqoLW7K0= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5005006)(3002001);SRVR:BY2PR03MB490;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB490; X-Forefront-PRVS: 06515DA04B X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB490;23:kvgEa/mGq3piyLhIj7iRJ2NERNvnoyFlijHCpbjKd4KL59gFkNLvO7YAh1oFQ50h49yBUGYHbRf7hkqISRjROiWEofJmKGIfKxVCWp513+ROybmFp12IbBUvoaZw1/VMMCKHGXLslnxxjqGPxVfmI1M7FpG8xg7TpkO71eHYTPIzAPFPzRbsvepCDERbwfeBK5+5W7IzMstf7AirtGUtiRfyPJnAXK5sI9LMHMtf/7uF3wcSGEzek9loXZ5EALQ9asfUvWwsxyv1RnaV0xfJuAYLYbtulIcZVI5eFl/Ez59NQr69aiNocGqO4hN3CYTyca6Fg1JC2s4UujVK4ibM6mFXQ6xVGdd7iz9R8iFdGSFiG8NI5Fh5MyuI6Tl8D79WA2+y5o1FHWP6AbbOxjRKybZZzEBuVH0zZtkJzJZnbjHvDlj4TvhCnqF5dtHC8BS5bxR8i8pyKzmz4myzPWEKd5ElgowzJHA3lBZ6wcKEeUGncWBN5GKcXtmYUlx1oNmjSDsFVF6as4uB8NfM4Ipqyzau0YdaCURTIL0kEfvF9HAL8gPmZtHdzEug478iGSho/tOXA15eyVLA9sbQJS+WjswyiGYDPCDW1nq7TsxEuohQPvmdOd8PHGuZSls0rpsWXDbDtLwWTBv8DVp5SoqFmHuoRtRa/OCfmDOHvBpp50Y8npm1eQkEUq/lEYgmRhkr7Qrs1dJ0N1xFR1LS08ESQFdnvrBg2f1NEN60IWNJ/wsPVgHogHtZS6i205xreAgAxUXmPkY2K2OlfbahXe2TIxRF0IMIJe4+klOYd7tAK8zqIPfKD7zFFUrKbkW9ohnK X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB490;5:sUsAlWAdubj2ZBkyuylrBOeoP5adHl3JdQ1pdl05gszIKFyCPFen0Vx1lujGiv4EDgPs6jjIHNe65l/x0jOgztWZ5G7qRr/rL5x3wrFmPhlbN8xRQtnNdcv2959B+mP25EAUK+1Bp1aprDByohJIEA==;24:xAPVcg3bNsjnfkXKr42tEZploXSGyBs0pmGYxUg4/0/3WEXKnhTDHEvbibaQH/NboXVwYwemc1S3hFGAZq4jbZ0kIVHVGoWvuzQBdhDu/Cc=;20:TgFOzFAp+3xJIysENdJ15/k3InaOwV5XoDxc0wHK7RsIjwtU3B7Eidt0opzky5KHuTiHPCG7aEueoXCHeV4e+w== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jul 2015 19:17:50.4025 (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: BY2PR03MB490 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