From: Hongbo Zhang <hongbo.zhang@freescale•com>
To: <hongbo.zhang@freescale•com>, <vinod.koul@intel•com>
Cc: mark.rutland@arm•com, devicetree@vger•kernel.org,
ian.campbell@citrix•com, pawel.moll@arm•com,
swarren@wwwdotorg•org, linux-kernel@vger•kernel.org,
rob.herring@calxeda•com, djbw@fb•com,
linuxppc-dev@lists•ozlabs.org
Subject: Re: [PATCH v11 3/3] DMA: Freescale: update driver to support 8-channel DMA engine
Date: Thu, 17 Oct 2013 13:56:40 +0800 [thread overview]
Message-ID: <525F7C18.3010409@freescale.com> (raw)
In-Reply-To: <1380188023-3936-4-git-send-email-hongbo.zhang@freescale.com>
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 <hongbo.zhang@freescale•com>
>
> 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 <hongbo.zhang@freescale•com>
> ---
> 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 */
next prev parent reply other threads:[~2013-10-17 5:57 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-26 9:33 [PATCH v11 0/3] DMA: Freescale: Add support for 8-channel DMA engine hongbo.zhang
2013-09-26 9:33 ` [PATCH v11 1/3] DMA: Freescale: revise device tree binding document hongbo.zhang
2013-09-26 9:33 ` [PATCH v11 2/3] DMA: Freescale: Add new 8-channel DMA engine device tree nodes hongbo.zhang
2013-10-08 3:22 ` Hongbo Zhang
2013-10-15 13:38 ` Mark Rutland
2013-10-16 1:59 ` Hongbo Zhang
2013-09-26 9:33 ` [PATCH v11 3/3] DMA: Freescale: update driver to support 8-channel DMA engine hongbo.zhang
2013-10-17 5:56 ` Hongbo Zhang [this message]
2013-11-05 2:31 ` Hongbo Zhang
2013-11-08 2:45 ` Dan Williams
2013-11-11 9:12 ` Hongbo Zhang
2013-11-12 0:09 ` Dan Williams
2013-11-12 7:05 ` Hongbo Zhang
2013-11-13 8:57 ` [PATCH v11 0/3] DMA: Freescale: Add support for " Vinod Koul
2013-11-13 9:54 ` Hongbo Zhang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=525F7C18.3010409@freescale.com \
--to=hongbo.zhang@freescale$(echo .)com \
--cc=devicetree@vger$(echo .)kernel.org \
--cc=djbw@fb$(echo .)com \
--cc=ian.campbell@citrix$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mark.rutland@arm$(echo .)com \
--cc=pawel.moll@arm$(echo .)com \
--cc=rob.herring@calxeda$(echo .)com \
--cc=swarren@wwwdotorg$(echo .)org \
--cc=vinod.koul@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox