From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756699AbbJUWIe (ORCPT ); Wed, 21 Oct 2015 18:08:34 -0400 Received: from mail-by2on0137.outbound.protection.outlook.com ([207.46.100.137]:46194 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754915AbbJUWI2 (ORCPT ); Wed, 21 Oct 2015 18:08:28 -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 v5 3/7] dmaengine: mxs: add i.MX7D APBH DMA support Date: Wed, 21 Oct 2015 16:41:37 -0500 Message-ID: <1445463701-5921-4-git-send-email-b45815@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1445463701-5921-1-git-send-email-b45815@freescale.com> References: <1445463701-5921-1-git-send-email-b45815@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11FD046;1:ufkt5tC8VN7rGo9byVl0AWeSN1b3BrFmPaB3bPDtN2PwCp4FNLl2QgqoTrdigb/CUKVZxXDT46NXeJOAZR7cj++AZO02jpZ7NOyTmxtJoTkCXRFLcMMkFbMLCzUcCeCQQlNNAio38pYX7ud74B8psEEKhGWfP4lc6zIwCdXjkxZVTZfy0fkppochgcGiImSt7+44yQGnidFmIcXrIEDpO/hQDU9xMZCnXSBRSK6rpelUcQKFz8KpNfODUyW5ggVhT2EEWATQERuO5AtTG/zvTromwAhonJtf/nLRkPqm/ZLfTT/16oTVwaYS4pYlMOhR95p6K1p1LNWwNEBVqaLDUJbNqAyeSsEwV4mgipceWMgtheHgKB7Cl76Z55j6cOsM0cr3l5HqzSQOY7rJ55iNjQ== 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)(217873001);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:u1UiqSijd2Zf2N01y0hL+/ZJS3ecDAWOKFg8oELFLz2XffxxVZ4Je03Rq5y3m22aW+GZXq/TZP7X9dnvu4TFRCqXzNKfo3tGZ2NNITawgXNr1ydoerhIRHJulkcNyuttxLNckbMlln4KcQPEmQ/fwpiZEawNy+9UYz7DaI2wAm0=;3:WxfOnLr66AehhdkEDA58616gqOnuwoldE6nJZ9q/q9/vlV1wfmTQvRXCXmj8npOoQF2JIoG+b3YDYz0MkydV9zCCPuMFUYZ7qGujkeOlH2/HpyyIzgiSRpussvq8P/tbcwmk5BXyPEmHzJAhVUsbNaqlrHqkleCCBSGHZM/Z0em+m1CKJsi7uqPPtRJ1/r/eQtRSmKbvcbkIesBqiR8jNo2ndO743Xp+3RAYOk7bad0=;25:s81NlIUpkZnp0zoqEt6xfzxifnTxIoVl1GfFs+zK5gOaNxnkqS7cYfLgaXFcsjYalEUG6/8D6iVQ2Vk3nYKi2Wsf+3wl9l4ftIYJ2syCs/KmUpeHP4c4DVj6ur6kR8OpBw29AFTnnx4wN8IgPybtwnzVAgs26p/SWlfzg+kdjpSQ6YoxoBxybEcCLEd8yuETiJOiOhDwv54DxuYJJv2Q8qw2+OnaYQRKv7tV7kIE5scCPjTKEWnU1QjwWzgIYYZd X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB558; X-Microsoft-Exchange-Diagnostics: 1;DM2PR03MB558;20:wCoqrLX1ctSBsNcrO4t6dilEay++2TIcGbj6S0vlA0Hx3Fe8NGMfaUgm1VMM0YO6vL3hHe6uaURIYXkYGzPvh2hUpt2Tv/QoiJwMYelvu79bnkxRTIgVFarr2kalJroo9Gl2oZr4XlGbDBvi7G0/ath+NOS7y8dZjyg88FirdWe2IkcMEyeL5NP86gFx5k4Rr3EGubPZHOW81kPvXt802vAAmSwSCbHEVmgUUXWYsXDkXcIRSeLiKEx9jv3wzIpotbx1j9ZVLHJ92lvnXWxoyrISUwQQ/RMgOtpJaNTHSeiJb4GF71dlxeiWDvWKPFKQfFJbOpSNVaap70trAzkZ0aIfxUZ7Cmkwc0pz/j+hPsI=;4:DHvjB1wjHPs6evb+WmYQMzFu9H5BDB73iZ7yX8sb8xZ3Xn48XsLtAK2oThfhq8VLWsJN4cE9338QklXC1UzdIs5JTObTlD9QDz/6OBBU4K452uAmk4QPsRbRuR1P3RkGgsrwKQ72Ee/xRj83w9EgB8nF+gw67x46J1/XbTC6wZSHGiBJYQELFXCqNvxiAqxpyQe5I6Ji9Bm1rYYipucrzHJJGTNXPtbrn4Xgl09PMXc2pr5j3karHkOM3z4kgJ6iMc0eArb2Z2RcO8msLUAbvwY9FX43F/VgzzTG9Fj166cYxBFFDBbmTYjWsPexoLdJKeZhXvcWCYkvgoT50tiNyOO4fN1vZeaeGwcZifMcFhGwDcSh+DglWwv06GmJPPXN 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:0JrLBq6FeMwzqGfBS96vk7e65AkioKQhgXP8FZQXY/?= =?us-ascii?Q?n8ksG46pPrgRqnSya/UKYlSmXYP2iVLLaEYNLBi8s+DXZbL8M8QZAB9edtPW?= =?us-ascii?Q?1lPIUl4GXgCzwzW+GhLXObGuwaPjNjmA06KNxsd7ACKT9TePiBLhOQYRYsg9?= =?us-ascii?Q?5blLmsNAOLAw7j1zkhFX43DuCxJLuilv3g3a3nu80PBi2CkUUIgiZ80FWRsd?= =?us-ascii?Q?TZCvn0hsT/WngQtNT2cjGGH9o6A1ydCWp/zQBKhCohFTCHFKQGrUQ5poC2s0?= =?us-ascii?Q?lBsuWWbkA5HUD5FKonGBhaC/6aNeDNtQPLIl6te0ik2SnpHz6XzXakaR1R7x?= =?us-ascii?Q?s0P2mPNzNrxglJG+i+cUQsOoNpH6PjtYrHyVuH/n8Z5IL/eBn3/mheD2LhMf?= =?us-ascii?Q?7Bo/PF0GVl/Esxnsm5w3Lzbll4bgzYJbESd066rWKNZTMrDaq+VpiNjXWfWa?= =?us-ascii?Q?dNkFcoK8EoE2cYIGTp5es8o4D8kEZtwd5SweeEMjbp2SRZ3qoiktXt8tTETz?= =?us-ascii?Q?yO0DtvELkxJXxdU8sOuUUF/iR6hVLdLsImYMTJAVY9klop31B5TqH3LmQ8E/?= =?us-ascii?Q?M9Uq5ShvgcVD118de3CbD7vvF9wIoeVUnVE7lbKvgzHrebaW+UdNK1hl94qi?= =?us-ascii?Q?Je/Si4vQFfFlqK5CDyncHhjaUum2VFuJHJIgi1q/KjnfPDaEjsnBBXn7i7tw?= =?us-ascii?Q?MnyuoZBBTSFaMLauRTfH8Mvae0QVqIrydq/Tv/Fb/QubFRm8obfkNZk9TxuE?= =?us-ascii?Q?RflBV/oALtyMBS+1lr3jv8T6ICXYZIJTYSoGPWLI2lHptPAVjQvfzbNrHc1m?= =?us-ascii?Q?lhJcCOE+1/ra37eAfSXpYYGWGhVnbeh5SLo3W5+eKH++KytzUzmVxEHhAGDa?= =?us-ascii?Q?X0zAlTyLE5zi5Q0svKfhIY6HgIWG3eMrVmSsC7a7Xxs3Zmj44c/23zp+Gq4L?= =?us-ascii?Q?E38kD76PCfVRNIg/b4CwQP1wSTn47Bow4wlKBpnSSWUKSVGPpSwJ4D6UAZ6h?= =?us-ascii?Q?jKd8wDrh+cCKniNqQ2k8weTCDxOueZyuR/xZKZQlRiGA5Y3X9UN0CjuMWDiM?= =?us-ascii?Q?AlK8HeE/cJKPfECOK3FWHD/48hI36fCbml8eC6mXk5ACdlDbIqCWM/pDn4FS?= =?us-ascii?Q?QPYEXmlaE=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM2PR03MB558;5:tsttB5JDuQ8ywlg1SnRO8iK7YfDkRu6LzvQNUoLAd80MWarRLYcs3vfq7hnlErDs9FJV9/6fDUs6V4Vtcjsgh6aP+Wvtbp6t+T7zH4BtgRoIrJU/I8fUW730U79uSXfRGFIV6u/uU6ho4LJig1tX3w==;24:TQM7Gbeeo2xugPsr0s+isVhozEZ9pxyxsoVjNcYLsjOcb0ThdbbvHZqOpFqzN36E639jvkkZJCO3GRFWj+oSfyhXz7DuV0AaIkf8LUqPsuE=;20:i5N/1dz7tGR6cIIQsYDaNsxhXq3S+nivkKPEJg5Zz5SMgtWStAf1fJptQVg7t/Y6oG6OoFxGfx54YRqDNv7JZw== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2015 21:52:36.0554 (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: 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 | 53 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 7 deletions(-) diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c index 7e5800a..72ce1ef 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,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); -- 1.9.1