From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932160AbbJ0WSp (ORCPT ); Tue, 27 Oct 2015 18:18:45 -0400 Received: from mail-bl2on0107.outbound.protection.outlook.com ([65.55.169.107]:1332 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752741AbbJ0WQx (ORCPT ); Tue, 27 Oct 2015 18:16:53 -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 v7 3/7] dmaengine: mxs: add i.MX7D APBH DMA support Date: Tue, 27 Oct 2015 17:05:36 -0500 Message-ID: <1445983540-27155-4-git-send-email-b45815@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1445983540-27155-1-git-send-email-b45815@freescale.com> References: <1445983540-27155-1-git-send-email-b45815@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11FD051;1:xHsoKt44V5SGcqRJuxv0t9Tk/lzVWjQiH6tncWb5vaqgm/obuyzpKekJbRl787m90cVu06JIFoeEnvx5GHcMSqFroGX1hziu7v56fnWdX+QqH7Wx/9cEepTkbtDOvZZZ83pYX3d++uSipTeFb5+a36j1sWORdXKdBkc5iwIAtoMQxfCD71VImKJ+OX12liK+4xPIb/x++wHuhFBH0cFTZLdve+yCOcWKwCtupkjizBazQl6it9E8T2pjzyyzBLxTLnlsdQ+DSs46NjkKsNWrZwS+a7dLVR22se9yxmP0Ts+LjX9UhNdZGGg27MVlICY5ASq5vSU4OZlchj8oOiXkFnnYihwahLVpe7edcKrFfLbW9E2zyEyae+kWLTlpA/6mXGHTXuPJlGwUauZz8pQtIA== 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)(106466001)(76176999)(85426001)(5007970100001)(36756003)(5008740100001)(50986999)(2950100001)(87936001)(6806005)(97736004)(50466002)(92566002)(47776003)(81156007)(104016004)(11100500001)(48376002)(19580395003)(50226001)(229853001)(2351001)(33646002)(19580405001)(105606002)(110136002)(5001960100002)(189998001)(5003940100001)(77096005)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:BY2PR03MB554;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;BY2PR03MB554;2:wcJgWbx5E8hfS0zmflK0uRGLPbwm4Q1SlRSvckzfWYg6jOS1bbAbOXDUhiR1RSl2jpctMzk0uhyX6lc3kEjpDVl8zSmShirz9o5TrQBevQROUJXnAT+DGAZ7BXUtOxezKdHJRukrzg3rxeC4rxxwa+Dt20VqjoPagJq5TUDP7lg=;3:wUeU8q2ejxQSczsfvf218HzORlHzmcizkqUJrThRTMSpWxYeS/HX+ihI1JYVGbgYkZkqtWygIzPCGeRDuW2d4d+q14Up3d1Qh7hAPEFVYPrEGaIrPip3qx9pniUTv+DxUbwK2sw19FkWndAbv0haHnN3oblFYRhro0n45107DjIcWnxeThpJH6KRkxr0U0Qld67P5rFpMwfARto9XNKTK92Pgbt9xhp3QhxVWFXKlGo=;25:WTGn54HaxSL4f8B0fnHQpQA6VdBZ1LdVwgEGsiwtfrBcbMXyWCHI40HmEuhQpo25/mdd3vTLHwi4JwSwtYNT3ilS2WAAVslDWVNZ83MGnrpw/0ASff96+FsaHZKYxP/dsaOpH1tmFyCnHdhj3HZtSdDR4ZOD7z57PV/eNEfkJMGUbw4/hxNoDOKaCogsdeBOr3AOCYCvAcSp3loKBLWdMvdIwx8D06aNDHop0WFliP7kzyolNp5YsdzjzbWxIWxO X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB554; X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB554;20:LcoVKA8MDid8o84SLTtj/M2KsZFB9TCzKl50xYptLHsLwcRqo3ntnCZG4gPtX3xWGiIzn9NNjd/L33pNHABgLjjNkPuA4/SCChKscCNIEmTM52bg9TWXk1kJK9qXT2iYHWoTZAEhie9O8v5QoNv2/qWNOgyHxFh3aqXxtScdB8cbWR4+bt7JEHo2jlbC0mKlqi+mEx5NqsA33Abx4P6G/InFLh/aedZsQD4YXPXHmnqZ+OR0zzNT2VoEWdWzZzf4vxHH9jK0/ptCU11dUVHMTdURhyMJR/FLRcNGzkjsuqDzuFqRpz/W+MvWUSm9R/ECAV7UHFpslQ7muUt/5BFp+ptoiLAzph2U4pkN75cTeOk=;4:0nASxoZz1woNKruwIGWHoJwYMqIRXZ01l8VKpENJXa7flvoKXlsXpxanomuJIIV4h7mt50k9NoBHIubVkUJqTyrtFF/4NPATmcKTfxMiGk4Bl2onFxC6ofKeMZfvQFwGkn+RZsLGV53yN1+CdUA60GSx6c1IMR3jVCikq6LRR7weqSBvdp45i6mFiem7FORhYuGJIiZZ54vspbdTZ5SmBNJ46z2JkrfCTjI5yZ1zTF7RRwECcBml4Ha4fFZz6fNPJUKvYWhlZLUP1z+uDZKwjey1TmN+qch/acRN52kNBzi70sQsZlkHCcRebgeLe0tRK9SnFVjiUsCoypjk2TdprSCZv6yATx/k1RE6GpMrV+FFpHg6uso1JPsNcwNjmbub X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(5005006)(8121501046)(3002001)(102215026);SRVR:BY2PR03MB554;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB554; X-Forefront-PRVS: 0742443479 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY2PR03MB554;23:AD5orhxoCVZEEayL321KUEaX7GhM5ljk9729xthnd+?= =?us-ascii?Q?0RFhiw6o4Dgv9rheJTqucdMGvtD8l71Fk0wEoJKilMRP06II+a/fTmRLAYqk?= =?us-ascii?Q?EO18Y+tO0uZjRxr2un6VbdBiLiHhyGCcozbrJ3/mkreDAI1UqFRT6brHjNE2?= =?us-ascii?Q?AeCKkyJEswE5bQnl9bca1TiPw/pq0d7v51jqSjPj0lBCKIFqjHCUZ2qaks5L?= =?us-ascii?Q?9ZnFbg0OPUHHNRkPVqHRs1mnlzvu6eF6uuSxUZw8gUvYh9JUTO7oxSg7PaL5?= =?us-ascii?Q?zSaghQn6olZrg4i7OBIaOsrc5E8X22Hl1hqX3lpESUvkmPrXepFLrd61vIoK?= =?us-ascii?Q?QiEf/U8b7Aa9DVugFj9zatXtT4LJg3yVKVH48kSk4pzkDo6mfjY6WB6454wD?= =?us-ascii?Q?xkkCShFH2XgB6SUqOhmA4nBmFhbvbFgXeLUnazFRhnMi/Lucf4dLEqjyHMBs?= =?us-ascii?Q?PdOa1B74I/4ToFGYajQ5XtNv0e3uj1Vp2XVxmtu9ddBDM63FaP7ClE2aPDHQ?= =?us-ascii?Q?C7zntSglTGITq4RTm6S7EmqPo0Scg1gH7Mwvc/J2OQtlzz3504nn3PpbznDU?= =?us-ascii?Q?+ymqPoIQz+QrWINi6sPXpuI6p3xm8pMSLrSbp5wao+l4CU2Rqt4R23i6HqJ+?= =?us-ascii?Q?AEYYNR0GSCzCAudkmSYGyFheyaTjLWABn5juAaZjwi/4etufDzA4H69GUQxr?= =?us-ascii?Q?sGLzM6QObsGncZN/UVPmGn15gD1FJv/1SVxTD3PFwXPfhTeTA0z/WO8QClKa?= =?us-ascii?Q?fAMrfdFIqU7PKRk7LKiz3YPhdx+vy5InsqRz5Z/NxhYq6isEdOBwG9guEvTG?= =?us-ascii?Q?ZYfnW+07BvxLQluwyKMyImXKht9lwptc0QfYU6z344SWqr3q8P6ewNLZdIdb?= =?us-ascii?Q?ydt0Odj8IUXagvHVEJCyGMFIh9j5vLqMapSOw1hsVoQvjXwBCoQoHgaCgqwC?= =?us-ascii?Q?/jHDJqqY+3QO1q1ZgPPqRWJDZfRCzsDE3mmeMiL3FBpeRIldc5c8VK/ZA/3O?= =?us-ascii?Q?I3nYGJGsVX4XxMYMvkbBUSynVqaE0ZMSAoLse3ZztDZQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB554;5:m8ij7S79cXpuXbfNHUEGcddFFR8idlyzgU76U+EPwy9EVwF26wQfjcTa7RVA4PrtLxHVbYmyF4uiy9IDEAlwt/MqROs0+BTm3Av/kmCYPbpcemt4M39t8xPxKNevYNK5UXArSh9ht1DEx076D7djQw==;24:u1xwBWybZT5fOTFG5sFyBRmTp3CSsJ+GU3J+p7cQYvpoTLUJtvZzV+TRxezO4BU7Rh/aZw+dJZ7k7IqG5t02OSxdOgLEUKRLEF3Enu6zNLQ=;20:g2zxEDvi4BJgIZ+WLLICBhYz66imVf/LkpNuet5enWJaeFzC2iHPc7sUsmyALWmJJJCAsRvhBwgNAAE7bCa3UQ== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2015 22:16:49.7821 (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: BY2PR03MB554 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 b8a4822e..f1878d2 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