From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759427AbbLBXCp (ORCPT ); Wed, 2 Dec 2015 18:02:45 -0500 Received: from mail-bl2on0102.outbound.protection.outlook.com ([65.55.169.102]:43616 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758640AbbLBXAV (ORCPT ); Wed, 2 Dec 2015 18:00:21 -0500 Authentication-Results: spf=permerror (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 v8 3/7] dmaengine: mxs: add i.MX7D APBH DMA support Date: Wed, 2 Dec 2015 16:47:42 -0600 Message-ID: <1449096466-18064-4-git-send-email-b45815@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1449096466-18064-1-git-send-email-b45815@freescale.com> References: <1449096466-18064-1-git-send-email-b45815@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11FD052;1:jrzQeNePOxvxVxlaOn39Cg/SS0KmuD6l6J6BKwy1ioJmXDBItw4td8BoEx6ZEY8mb5yYItPw+gLwXjfFti/uqVE7TT1/rcLNVD0AACKPQw5Sc3G+vMPgvCoKBJyAyit5MSInlVZuVjOvs4JJ1HFzLa4fsERv9CG6bz56JiTFIx50aRVO2Jbb7q1G352mdmSkEzXLp1pi1YZhvcgqmZtzDZxLlxX23PpEq2iQsL6XinUpg32eHPRs3cSLL9Z9PA0P7cISQPr7D+HJfd73mVYeHaDlZJPlaZolP6EOCBfAdPCrB2ULC3HvrEhmToIPH8F/e0YudIdSmHmgSS9V4TOXk86D6FyLCvCPZ8fxTOAguDAM/Srt+nRIHEBi9xk89BWrOGX9RoCoer0AOEIltT2eJiaglKNBMydwnN09CbglQ1VtuQ/NPrp1WzPH4mcUSVab X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(448002)(199003)(189002)(104016004)(6806005)(5001960100002)(97736004)(87936001)(81156007)(5008740100001)(189998001)(36756003)(1096002)(1220700001)(110136002)(85326001)(586003)(50226001)(92566002)(47776003)(48376002)(19580395003)(2950100001)(50466002)(19580405001)(77096005)(11100500001)(50986999)(106466001)(33646002)(5003940100001)(229853001)(2351001)(76176999)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM2PR03MB557;H:tx30smr01.am.freescale.net;FPR:;SPF:PermError;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;DM2PR03MB557;2:SORdxGCu709pgWQG4fQ5EX6UCJ/CMTHzDc+fgE4et32ohnG9FKh2PZoXhY8MFThkg2RMsNZEoUYYFg9LZcmQau6rxhneT+I3Z1OVO5RrIzEyFMLQ7SByfbdq/Pcct6AAL2RoxH4S6kUwDcq+XhQEtg==;3:qqDo4+A1vtm4ScA7QL6AAZfcjTj7xBKKJCiayo7UZ25x1shVuizwaW1q520/Rld39idf0X4Rd1QXsxaRGFFsSYY8VHTrtykAnasd7GFWWrG+89provJXzYnlssoe1KVKwampEg12nbef+iyq6Io8P4wpJ8T3qfgA8D1yTmRoJkd6SHbGDjzBcDQT4Y/mxHx9yQ/O90uGXjF271+1dvJJiVNHdXoVDYOiQmhFRdJ1sXk=;25:vOtdqBvKSO0v4a74kwYETmM8POw6xp2LZyKaWQXteGdAVSuHOrPZu+PxB6Pz4EJHrtcFH6jALAzv4+YII27mtSO8EQFEEBk6JKoY993mPyBz43CdcQyOPa9hoLMZYb+LODXeRIZHBTV4hlEyWqkdjFkGtPav/Bvw+WxAxuy7VBxQ9F9u72nd2YlUOufZ8Ht08tTMgdSp5nLy8bKN7+9Vgd7RNhXkONwTktmXN7+m01YPvhrKRw4beN4WKEj9BMS9 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB557; X-Microsoft-Exchange-Diagnostics: 1;DM2PR03MB557;20:bxwP8DqEAPGACKzIq3RHz7UzV+Wf76hFRNh4lIW6/GTShDtZqh5X007C0U4XssE/++JRjcZ2qbuRuWpLtBDInVUByxHdHnDO5QoT1ZKUuQbZNv6BxTrL8ZNUGUhKMVIfO9cb64MtHuDV0SobbEoI/1Hl5z7gQQbcJ/TX5QYQm+KMEo6f25T3hyS24w9UhdJotv29dUcfpIYNVt2n5Mi2sqm7imnxUnJN7K44snxA9xOaRasgVX+WMwEB37yoX0CcMAxJpHcfdp3QYwrS9hI97JyiEnmz8Gy7rWpR4DbhSaJrBOzkHxnmVSLBHxJDuQhCfP0afM5GQ1G8535ggvBKjKnRanwyq/pp4PW0baAmUu0=;4:EWUoteY7Q6tGDS0gGoogYx1cKxSwGK6ZT9QYZlOab+mdR02dlHUzNben2wDSrulMzVZWzCL4G2WXvZS/FtCiUuJqGR8aoFsirjPRhJCsYwubFeFu+0ziecsmpND7kaULW0QoW2X3cK3Sxo9cqDCJq/ggLRvK5YAQ72MSAzLjBn6nlX6m95lLn3XbNeijdAKgO3ohYCcf5odnC1HGb8ABtLk77DHxhCMSHWEVt+jIfesYz5Nt1PJgncBk/stGTejlAjkYOZ4UeauOJwwia57vhCR3kSGunrX9k9WldjoUzepn4lqH1H/NJCPTJHatJHKkkee/XZ36Uqx0emNTMdwG2N78Eg3E7EcTDm84ygmvyowKTACubDqZ/kPxa/tbCILHP23Ut8YGxbVHPwMbsdI9SUjkgm8eRUHx3JZBT11/Mic= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(5005006)(8121501046)(520078)(3002001)(10201501046);SRVR:DM2PR03MB557;BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB557; X-Forefront-PRVS: 077884B8B5 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM2PR03MB557;23:9cyXejyd9kd0GmS1WM90NvMA7N6qJxvIMyYri5Uy2J?= =?us-ascii?Q?DBwSlnE8sPWs8nBroO6tfI4JBRuGetzeIdetzWODeQRDIlH1YLEe5Vpg74h4?= =?us-ascii?Q?O73+PkMozev811xLpiqxc4tzIy+JFGlNCwK1S7w/BGOKr+FdEmgnmyMm/Jd0?= =?us-ascii?Q?TYNpox/YGP1Oj1pKKHo1Cj4fym0UZXQ09wfSb8r6KlcRwRcYc89bdvaQJhbT?= =?us-ascii?Q?yAaK4iXJoYFzKpCIWSFaDl0YBzckGv+OQfUc7/d52RH4QMekhElp/vrYozFD?= =?us-ascii?Q?EWhFfcO/nv1xIOLfqfI5q5HTOk5wZrA/CdyxItG8ht2e990k5QHmRLPix8l1?= =?us-ascii?Q?5SYfqi/NL44oGa4QByNCjkxJKN1oDRCA6dag6h6h2vxRZ41r2Fhw/vFM8PJn?= =?us-ascii?Q?MJgl7DEzGMYirvG4hVqPOa4lyJ8uQnTAqRlOW+uMFRCVMmf4Mhc4ecwFe9ST?= =?us-ascii?Q?76CBfCphJre9SN2Zppfo+vrwxgpvKEC5bMxHJaAOxb3gIvU2cELkXMQLoBXN?= =?us-ascii?Q?phAU4MAepWL1hcqS1NjUcnFPt2RuUlNfy/17rhdFUfGgatLgCraNEToPC0x/?= =?us-ascii?Q?42I7ibQU6jBO8Y9iqEvQYnuIkumFQeQ3pDfRyLtOKcMqCYvlzCrWZxWSVuLN?= =?us-ascii?Q?H51aJF0spLRoUaNclG4cFoWp/LcTqMR32ZmIcYZkv+EchZsx+PbSvjVXQDwn?= =?us-ascii?Q?NV5NjqG00iazAXSsjFqo1g7gDIEknxUo3Ww0NAFYkyPAds8TX2u6c860XsEk?= =?us-ascii?Q?Kqph8tv9NKRAMcH02jparIsXHN6SrKZ3dJ+xdIZxpcQn6wOTI/FegWKQmhiL?= =?us-ascii?Q?zfIX1NREf3P0xvUhXG4uH6JPmtKYSxPq+sVfg5Hfo8UkEg5HLZwaAjOPJa3m?= =?us-ascii?Q?nG+uveiw6s2LCLGWD9bKSCMzZf+u6OUN3HD20HFYBrqKExyvR5/IOLRpGtgc?= =?us-ascii?Q?vcVTwlIhJuqZwxaBymPs2rkE6dXIAJqsjX1llIGKQT3tHblBdFytlTcg/DzI?= =?us-ascii?Q?M=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM2PR03MB557;5:E738FpFuTXoOXrZpFEWHwNoou4UyqKexqK/ernd65JnqlD7lqbSxa/X4oqnt4hdHjW1YruAttHrcMOlXh15tjXYfO++QXnoP3d+z2uc8fV+jkKzXluWHjGCLTASrll0ROVptihzzyBjjkGyH/MwXHQ==;24:4/5dCilhWWn2jcmG+IpNtZAf/zj52hn/f8wUx5SPOwXXiWjSHpJmJnKGqwL9+ePpQcdxb2UvG3ZNKiN7M8ICFG/zUgjSfGksxawMyOAajCY= X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2015 23:00:17.4460 (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: DM2PR03MB557 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Adrian Alonso supports APBH DMA on i.MX7D by add extra clock clk_io Signed-off-by: Fugang Duan Signed-off-by: Adrian Alonso Signed-off-by: Han Xu --- drivers/dma/mxs-dma.c | 52 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 7 deletions(-) diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c index eba51fc..3691b4a 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,13 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan) if (ret) goto err_clk; + /* enable the extra clk_io clock for i.MX7D */ + 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 +465,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 +488,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); } @@ -701,9 +721,15 @@ static int 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_clk_bch; + } + ret = stmp_reset_block(mxs_dma->base); if (ret) - goto err_out; + goto err_clk_io; /* enable apbh burst */ if (dma_is_apbh(mxs_dma)) { @@ -717,7 +743,10 @@ static int mxs_dma_init(struct mxs_dma_engine *mxs_dma) writel(MXS_DMA_CHANNELS_MASK << MXS_DMA_CHANNELS, mxs_dma->base + HW_APBHX_CTRL1 + STMP_OFFSET_REG_SET); -err_out: +err_clk_io: + if (mxs_dma->dev_id == IMX7D_DMA) + clk_disable_unprepare(mxs_dma->clk_io); +err_clk_bch: clk_disable_unprepare(mxs_dma->clk); return ret; } @@ -803,9 +832,18 @@ 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); -- 1.9.1