* [PATCH] dma: mxs_dma: Add the missing entries for mx6
@ 2012-07-25 11:54 Fabio Estevam
2012-07-28 15:21 ` Shawn Guo
0 siblings, 1 reply; 2+ messages in thread
From: Fabio Estevam @ 2012-07-25 11:54 UTC (permalink / raw)
To: vinod.koul; +Cc: kernel, marex, linux-kernel, shawn.guo, Fabio Estevam
From: Fabio Estevam <fabio.estevam@freescale.com>
Add the missing entries for mx6.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Build tested only, as I currently do not have mx6 board handy.
drivers/dma/mxs-dma.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
index 7f41b25..6e8509b 100644
--- a/drivers/dma/mxs-dma.c
+++ b/drivers/dma/mxs-dma.c
@@ -128,6 +128,7 @@ enum mxs_dma_devtype {
enum mxs_dma_id {
IMX23_DMA,
IMX28_DMA,
+ IMX6Q_DMA,
};
struct mxs_dma_engine {
@@ -158,7 +159,10 @@ static struct mxs_dma_type mxs_dma_types[] = {
}, {
.id = IMX28_DMA,
.type = MXS_DMA_APBX,
- }
+ }, {
+ .id = IMX6Q_DMA,
+ .type = MXS_DMA_APBH,
+ },
};
static struct platform_device_id mxs_dma_ids[] = {
@@ -175,6 +179,8 @@ static struct platform_device_id mxs_dma_ids[] = {
.name = "imx28-dma-apbx",
.driver_data = (kernel_ulong_t) &mxs_dma_types[3],
}, {
+ .name = "imx6q-dma-apbh",
+ .driver_data = (kernel_ulong_t) &mxs_dma_types[4],
/* end of list */
}
};
@@ -184,6 +190,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,imx6q-dma-apbh", .data = &mxs_dma_ids[4], },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, mxs_dma_dt_ids);
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] dma: mxs_dma: Add the missing entries for mx6
2012-07-25 11:54 [PATCH] dma: mxs_dma: Add the missing entries for mx6 Fabio Estevam
@ 2012-07-28 15:21 ` Shawn Guo
0 siblings, 0 replies; 2+ messages in thread
From: Shawn Guo @ 2012-07-28 15:21 UTC (permalink / raw)
To: Fabio Estevam; +Cc: vinod.koul, kernel, marex, linux-kernel, Fabio Estevam
On Wed, Jul 25, 2012 at 08:54:02AM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> Add the missing entries for mx6.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> Build tested only, as I currently do not have mx6 board handy.
>
> drivers/dma/mxs-dma.c | 9 ++++++++-
> 1 files changed, 8 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
> index 7f41b25..6e8509b 100644
> --- a/drivers/dma/mxs-dma.c
> +++ b/drivers/dma/mxs-dma.c
> @@ -128,6 +128,7 @@ enum mxs_dma_devtype {
> enum mxs_dma_id {
> IMX23_DMA,
> IMX28_DMA,
> + IMX6Q_DMA,
> };
>
> struct mxs_dma_engine {
> @@ -158,7 +159,10 @@ static struct mxs_dma_type mxs_dma_types[] = {
> }, {
> .id = IMX28_DMA,
> .type = MXS_DMA_APBX,
> - }
> + }, {
> + .id = IMX6Q_DMA,
> + .type = MXS_DMA_APBH,
> + },
> };
>
> static struct platform_device_id mxs_dma_ids[] = {
> @@ -175,6 +179,8 @@ static struct platform_device_id mxs_dma_ids[] = {
> .name = "imx28-dma-apbx",
> .driver_data = (kernel_ulong_t) &mxs_dma_types[3],
> }, {
> + .name = "imx6q-dma-apbh",
> + .driver_data = (kernel_ulong_t) &mxs_dma_types[4],
> /* end of list */
> }
> };
> @@ -184,6 +190,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,imx6q-dma-apbh", .data = &mxs_dma_ids[4], },
We do not need it. "fsl,imx28-dma-apbh" should just work for imx6q.
Regards,
Shawn
> { /* sentinel */ }
> };
> MODULE_DEVICE_TABLE(of, mxs_dma_dt_ids);
> --
> 1.7.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-07-28 15:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-25 11:54 [PATCH] dma: mxs_dma: Add the missing entries for mx6 Fabio Estevam
2012-07-28 15:21 ` Shawn Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox