From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from tx2outboundpool.messaging.microsoft.com (tx2ehsobe001.messaging.microsoft.com [65.55.88.11]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client CN "mail.global.frontbridge.com", Issuer "MSIT Machine Auth CA 2" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 0856A2C0141 for ; Tue, 5 Nov 2013 13:31:42 +1100 (EST) Message-ID: <5278587F.7090500@freescale.com> Date: Tue, 5 Nov 2013 10:31:27 +0800 From: Hongbo Zhang MIME-Version: 1.0 To: , Subject: Re: [PATCH v11 3/3] DMA: Freescale: update driver to support 8-channel DMA engine References: <1380188023-3936-1-git-send-email-hongbo.zhang@freescale.com> <1380188023-3936-4-git-send-email-hongbo.zhang@freescale.com> <525F7C18.3010409@freescale.com> In-Reply-To: <525F7C18.3010409@freescale.com> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, ian.campbell@citrix.com, pawel.moll@arm.com, swarren@wwwdotorg.org, Hongbo Zhang , linux-kernel@vger.kernel.org, rob.herring@calxeda.com, linuxppc-dev@lists.ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Hi Vinod Koul and Dan Williams, Ping? On 10/17/2013 01:56 PM, Hongbo Zhang wrote: > Hi Vinod, > I have gotten ACK from Mark for both the 1/3 and 2/3 patches. > Thanks. > > > On 09/26/2013 05:33 PM, hongbo.zhang@freescale.com wrote: >> From: Hongbo Zhang >> >> This patch adds support to 8-channel DMA engine, thus the driver >> works for both >> the new 8-channel and the legacy 4-channel DMA engines. >> >> Signed-off-by: Hongbo Zhang >> --- >> drivers/dma/Kconfig | 9 +++++---- >> drivers/dma/fsldma.c | 9 ++++++--- >> drivers/dma/fsldma.h | 2 +- >> 3 files changed, 12 insertions(+), 8 deletions(-) >> >> diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig >> index 6825957..3979c65 100644 >> --- a/drivers/dma/Kconfig >> +++ b/drivers/dma/Kconfig >> @@ -89,14 +89,15 @@ config AT_HDMAC >> Support the Atmel AHB DMA controller. >> config FSL_DMA >> - tristate "Freescale Elo and Elo Plus DMA support" >> + tristate "Freescale Elo series DMA support" >> depends on FSL_SOC >> select DMA_ENGINE >> select ASYNC_TX_ENABLE_CHANNEL_SWITCH >> ---help--- >> - Enable support for the Freescale Elo and Elo Plus DMA >> controllers. >> - The Elo is the DMA controller on some 82xx and 83xx parts, and >> the >> - Elo Plus is the DMA controller on 85xx and 86xx parts. >> + Enable support for the Freescale Elo series DMA controllers. >> + The Elo is the DMA controller on some mpc82xx and mpc83xx >> parts, the >> + EloPlus is on mpc85xx and mpc86xx and Pxxx parts, and the Elo3 >> is on >> + some Txxx and Bxxx parts. >> config MPC512X_DMA >> tristate "Freescale MPC512x built-in DMA engine support" >> diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c >> index 49e8fbd..16a9a48 100644 >> --- a/drivers/dma/fsldma.c >> +++ b/drivers/dma/fsldma.c >> @@ -1261,7 +1261,9 @@ static int fsl_dma_chan_probe(struct >> fsldma_device *fdev, >> WARN_ON(fdev->feature != chan->feature); >> chan->dev = fdev->dev; >> - chan->id = ((res.start - 0x100) & 0xfff) >> 7; >> + chan->id = (res.start & 0xfff) < 0x300 ? >> + ((res.start - 0x100) & 0xfff) >> 7 : >> + ((res.start - 0x200) & 0xfff) >> 7; >> if (chan->id >= FSL_DMA_MAX_CHANS_PER_DEVICE) { >> dev_err(fdev->dev, "too many channels for device\n"); >> err = -EINVAL; >> @@ -1434,6 +1436,7 @@ static int fsldma_of_remove(struct >> platform_device *op) >> } >> static const struct of_device_id fsldma_of_ids[] = { >> + { .compatible = "fsl,elo3-dma", }, >> { .compatible = "fsl,eloplus-dma", }, >> { .compatible = "fsl,elo-dma", }, >> {} >> @@ -1455,7 +1458,7 @@ static struct platform_driver fsldma_of_driver = { >> static __init int fsldma_init(void) >> { >> - pr_info("Freescale Elo / Elo Plus DMA driver\n"); >> + pr_info("Freescale Elo series DMA driver\n"); >> return platform_driver_register(&fsldma_of_driver); >> } >> @@ -1467,5 +1470,5 @@ static void __exit fsldma_exit(void) >> subsys_initcall(fsldma_init); >> module_exit(fsldma_exit); >> -MODULE_DESCRIPTION("Freescale Elo / Elo Plus DMA driver"); >> +MODULE_DESCRIPTION("Freescale Elo series DMA driver"); >> MODULE_LICENSE("GPL"); >> diff --git a/drivers/dma/fsldma.h b/drivers/dma/fsldma.h >> index f5c3879..1ffc244 100644 >> --- a/drivers/dma/fsldma.h >> +++ b/drivers/dma/fsldma.h >> @@ -112,7 +112,7 @@ struct fsldma_chan_regs { >> }; >> struct fsldma_chan; >> -#define FSL_DMA_MAX_CHANS_PER_DEVICE 4 >> +#define FSL_DMA_MAX_CHANS_PER_DEVICE 8 >> struct fsldma_device { >> void __iomem *regs; /* DGSR register base */ > >