From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965550AbbJVUGP (ORCPT ); Thu, 22 Oct 2015 16:06:15 -0400 Received: from mail-bn1bbn0101.outbound.protection.outlook.com ([157.56.111.101]:63952 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758184AbbJVUFj (ORCPT ); Thu, 22 Oct 2015 16:05:39 -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 v6 3/7] dmaengine: mxs: add i.MX7D APBH DMA support Date: Thu, 22 Oct 2015 14:54:32 -0500 Message-ID: <1445543676-19876-4-git-send-email-b45815@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1445543676-19876-1-git-send-email-b45815@freescale.com> References: <1445543676-19876-1-git-send-email-b45815@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BN1BFFO11FD054;1:6b0m/5zRVqPiQV0m5dC7noiUmrSxyxKREPiUKZXGoL/b7o8NrN8qL4Qw6Drb6ayeFVDT11wjtcFi+nGqIjpgmh4R2IFd6GRdTfafC6lxjDmotPZy4xUq1H3aR+N5mqbqVxVPxN2RuLtMmuyYlnPsoFEQE1OdlysNzaam63x9vjceoTMLJN3gQXtF/kWERMSeYo3itb9ni7aaqadCeQhIbGWIfhsbmiIUKylgFR449v2PDWIQj2zn8fOjmMC7vV7HKzJBjOzIJQuQGjrHa5WrvlMsBcSjac6LtWTddOQedSt/LHef+PViyxXCchsvCNgwsjMHiD4Nmqr2vCs+OvAihDdFwA+TB7zlkMvXL1SFIbpH8wcTUdxSenN0e/NAf6qwgAHuVtmIBL8We6ac8+Cedw== 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)(87936001)(76176999)(36756003)(50986999)(6806005)(104016004)(11100500001)(85426001)(47776003)(5007970100001)(48376002)(50466002)(2950100001)(19580395003)(110136002)(33646002)(5001920100001)(105606002)(77096005)(19580405001)(5001960100002)(5003940100001)(2351001)(106466001)(229853001)(81156007)(50226001)(5008740100001)(92566002)(97736004)(189998001)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:BY1PR0301MB1302;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;BY1PR0301MB1302;2:YWUQ24bwltYdHzLRckcDrc11QHWXU3yjfnRrCkve1oXXQd/F9+BQuWtcde86QbUl/2U6EfE9D8j6LF/qCro18U964ry1Ubn7HG3+nH0sx92gPsCwDNVQ4fmqICgKXgKmqyMZPn4UP1WOmjW3nQAMzk9bTBm/BGk/NjSb8bodyiE=;3:eXoWjZwTBPCeaB4SEdESOWFNpO5lR/bfhNPy0eECPqZ357kWlUOkzRkqreR2N8sAaR4YhT9av+uqtTnwGt/ND1g3VFoLDJCGBOnf6xVTSo/fGUWUh7QT9Y0L5gj+vHwhp7kPF1UpxekfLi2eJi4nDWRT17WzNPg9FvVhvTRvlnngfHHj3bWGvjWx9HKXRoRbFMyoVXAO/nJnsbXWl1IBu9SFtEHzB7Jb7Tu+TS0Yq+U=;25:k/PnrJ6UdZTmNELro21I/j+3ck5CSoYkCJ1JdWBiK5LJHifAsp4j80I7KIAQb4ZdA6OszAi91fBg2IMNeCynpwz1eDvs0UJJrCmQXtW8iDl2Iy3sgGRqTX9ZRKX8wR0mNWEO4A/nOub4ov2R7ffXMfiXjU6wZM4TsR1hRnAIB7o7NJ49Y5EN1ye9fhYg+RiiX4YMfY1ayDZErhLOTaIm8W+6OMsHDMmSbiV/EVMrP4wnhKwepAuyV5Xcu3iMeSnF X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR0301MB1302; X-Microsoft-Exchange-Diagnostics: 1;BY1PR0301MB1302;20:o6GjvFc6LprWTD2aI7onpd6raNGtWkHFYzSUCC/zMEm1t12TXdP5LzzfBDGtWw494tv0IAbfZ811i/rogQc1wQtjLy+vSPeM3LI/gpU9stXmXcJ2veB2YwH2gtOFzxYCiSN1OhC1PVOmhZAk9glrcf4xcAbCCKSL1pJbbJOnhwUs6LxCVp1TCAOpmJfPp51PfLiXaNczL2gwvoBzi4BZBIDa3rCaW6twI2Kb8ahm9xD79CFQI7Sb31rGcABDqFRaiT4tR9IPa+MVVlot7k7d3CL23I79ajxDT1w2wtSwiUYuNaC7mpe12yXiVF4DbU1jBu7gCO9mFJ4ul6MB0e6zl4FxsFl8a1Lm91OW6fbyhP0=;4:kb1UeQ53HVVQa5h8CPtNKRIW14SLXZqiLJjz2RjXFGbtn2KSczoJ9Uy8ScmAhvSxISG2cV6kkWJwiduZobcXLt2tBYOVpcea9KzQaKpElbMl22lWIBgiAYI7D526b7Edl60D4cvw94ssyQYQAHQ+XqVUIdL/n1ZanluCheJwy0JFHVEcpR9q3W9ZGvtwE192hepxH7HdS+9QReyJI8xGpdYGpcw8q0xw76cFgwnXgyKwbqdjX9JQ48D7h1UpvAe2JTA1F3h40wJOCeY/TrGepycZz0xm2fgbO/rKhXPMzOi7uiOz6erw0A+8+GJSE4SqM2+Er8kccAFFiB5nlR5KR9nmoiFzdFzW5oU7PgjF19fxafg8mYgjpR9Idkol1reT 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)(520078)(8121501046)(3002001)(102215026);SRVR:BY1PR0301MB1302;BCL:0;PCL:0;RULEID:;SRVR:BY1PR0301MB1302; X-Forefront-PRVS: 0737B96801 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY1PR0301MB1302;23:FRz6BJ0iGYTP9W1gES8FTvkYkyS8Xn+B+0haHs6?= =?us-ascii?Q?ABtfwFMIrg9gqb9qDbi4bg7bVH8Ai3ZB0gwchJmgkIBa8jg9wDZwA+8Jpg/q?= =?us-ascii?Q?wokbrUJspiywW1XUeAIdB+ZACuS+wi/45AodstuDXJZ/+xqLguiB+vCNTBta?= =?us-ascii?Q?b84n/QaE6gnJsiOtX8WJowKF+Ie/my0SJxhZmjBwM4XHIBcwkF+3F3/U9fKG?= =?us-ascii?Q?gayGUL1Z7l0kJxTkvyCtppQSNnSuo7HNBk8fAS3SGvxtvBlK4E4Pv1ZdPr4l?= =?us-ascii?Q?j18tmBRe9Y0rZTPz/h0dml7qqjE/C19WtJuZDWfkjmtZ/kDQsxgamjfW5cyo?= =?us-ascii?Q?gyPuFkbogStu5ea5BeGcJLXRjG4u7zpG9gaTVx9ydgQb8eBHccbysyePV9qw?= =?us-ascii?Q?4bNNGz1buEL0VcSaQlKcV8Y6ajzXqvl68uvLsVaKsGm8K4p+u1ODdbrhrkog?= =?us-ascii?Q?j+AqUIuyyEITmE//9AQhklwG96yULhvja1Wux9sp2dbYBI/dOaSMm787iKNU?= =?us-ascii?Q?0QwucsLxVx/FcEcz6sXrIoAmGuLDj0BlxEGZ67aAXANzTarwmVSrS0tygSjX?= =?us-ascii?Q?6Tq/Ze50B73UkGcZdu8XpcpZ1N9dF9+6ZdbO7NYA0yczhj2NJeZOTHqaKs2Z?= =?us-ascii?Q?HgvMdEbOkiiXnLm8ntxGvXotxLqnSXQCs7m4EihVPcQI7wdwo79A5wmyu3lS?= =?us-ascii?Q?XscKJv8tEGG2BkvMR09idEvadE8SpuzpHeGp8qQmHwdP/um62hQRd6HRZp4j?= =?us-ascii?Q?12yo4aE5EaoEIh/yId1lmrU2NGJYYEisvW+P0WiDuMciDpNvE9OkTBZYxars?= =?us-ascii?Q?9bldLStNNxK4fXFcJuR4g3qaUz7OgxhbIUrJYqI1yGdMP/11+8/RSrC3bXz5?= =?us-ascii?Q?0Rwh7nwT+SQVhI2D7zDnbNhAJ3+Ml6/UDyPi53vqWjxBTKP6tLPL8vWzpwhs?= =?us-ascii?Q?Gfxc7zs+LizRZ1h1oQbxT5KToAfyhMOGnDBkqmZ67oQ5xAOlKOS+ZTtPvd7p?= =?us-ascii?Q?lFRyE9IbzoKExNtdCh+a6+/LNCPB2b6IWptScCs64bUPllfej7yG8bZLcrD1?= =?us-ascii?Q?kiRZ/46AIBD5kfHFzyFJAB4q9+Y8j?= X-Microsoft-Exchange-Diagnostics: 1;BY1PR0301MB1302;5:0UPnVCEYSdGDgNoEXJk/BCsBbaerSuKKyTXY/QjVcitcQ02eu+VJOGj9P4ax4HET5ZA9k/kb9T3dYxm48NZfJbey/3zxHFDSpKawJ/42k0RdM4OFzefUaKJsMoqL3JNLFe3DbPBnOWXpqzaz1pFUgA==;24:28I9OZKrYUX+42T9VSB/A9lfeVZitYCb8dK79paeGsygLh9BPfQIH3yNhpLxH7oeKL7JBPG8ierFziAyKs/DcM+ftA5MWMrNg74m1T2YnJw=;20:rCxB1W5j/sSO/pJh0bsEXPD7GwUC5vIks415+TG9wUctoUfzWxmaJ3MBuHeARM9hYxPw3uRgKxyTPEuxCs71EA== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2015 20:05:34.8969 (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: BY1PR0301MB1302 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