diff options
| author | Huang Shijie <b32955@freescale.com> | 2011-07-22 10:30:22 +0800 |
|---|---|---|
| committer | Huang Shijie <b32955@freescale.com> | 2011-08-09 11:05:36 +0800 |
| commit | 5bc3f88b09acd6783dbe45d7cc9281a2d80df2f2 (patch) | |
| tree | 4db388bbb0f4588ebe35aa0828067db6218695c5 /drivers | |
| parent | 8d5517f82d5fa53254b27239585d2789f4130761 (diff) | |
ENGR00139247-6 DMA : add DMA support for imx6q
add the dma support for imx6q.
Signed-off-by: Huang Shijie <b32955@freescale.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dma/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/dma/mxs-dma.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 4cd9ae83c863..10d8aa8b0187 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -238,7 +238,7 @@ config IMX_DMA config MXS_DMA bool "MXS DMA support" - depends on SOC_IMX23 || SOC_IMX28 || SOC_IMX50 + depends on SOC_IMX23 || SOC_IMX28 || SOC_IMX50 || SOC_IMX6Q select DMA_ENGINE help Support the MXS DMA engine. This engine including APBH-DMA diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c index c912fc6f80da..d7b2ab9802bd 100644 --- a/drivers/dma/mxs-dma.c +++ b/drivers/dma/mxs-dma.c @@ -27,7 +27,7 @@ #include <mach/mxs.h> #include <mach/dma.h> #include <mach/common.h> -#ifdef CONFIG_SOC_IMX50 +#if defined(CONFIG_SOC_IMX50) || defined(CONFIG_SOC_IMX6Q) #include <mach/system.h> #endif @@ -581,7 +581,7 @@ static int __init mxs_dma_init(struct mxs_dma_engine *mxs_dma) #if defined(CONFIG_SOC_IMX23) || defined(CONFIG_SOC_IMX28) ret = mxs_reset_block(mxs_dma->base); -#elif defined(CONFIG_SOC_IMX50) +#elif defined(CONFIG_SOC_IMX50) || defined(CONFIG_SOC_IMX6Q) ret = mxs_reset_block(mxs_dma->base, true); #endif |