ARM: mxs: do not add dma device by default

This will cause conflict when dt is enabled.
So let each platform add dma devices respectively.

Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Huang Shijie <b32955@freescale.com>
Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Marek Vasut <marex@denx.de>
Acked-by: Vinod Koul <vinod.koul@intel.com>

1 files changed, 1 insertions, 22 deletions

diff --git a/arch/arm/mach-mxs/devices/platform-dma.c b/arch/arm/mach-mxs/devices/platform-dma.c
index aff48136021..46824501de0 100644
--- a/arch/arm/mach-mxs/devices/platform-dma.c
+++ b/arch/arm/mach-mxs/devices/platform-dma.c
@@ -14,7 +14,7 @@
 #include <mach/mx28.h>
 #include <mach/devices-common.h>
 
-static struct platform_device *__init mxs_add_dma(const char *devid,
+struct platform_device *__init mxs_add_dma(const char *devid,
                                                 resource_size_t base)
 {
         struct resource res[] = {
@@ -29,24 +29,3 @@ static struct platform_device *__init mxs_add_dma(const char *devid,
                                 res, ARRAY_SIZE(res), NULL, 0,
                                 DMA_BIT_MASK(32));
 }
-
-static int __init mxs_add_mxs_dma(void)
-{
-        char *mx23_apbh = "imx23-dma-apbh";
-        char *mx23_apbx = "imx23-dma-apbx";
-        char *mx28_apbh = "imx28-dma-apbh";
-        char *mx28_apbx = "imx28-dma-apbx";
-
-        if (cpu_is_mx23()) {
-                mxs_add_dma(mx23_apbh, MX23_APBH_DMA_BASE_ADDR);
-                mxs_add_dma(mx23_apbx, MX23_APBX_DMA_BASE_ADDR);
-        }
-
-        if (cpu_is_mx28()) {
-                mxs_add_dma(mx28_apbh, MX28_APBH_DMA_BASE_ADDR);
-                mxs_add_dma(mx28_apbx, MX28_APBX_DMA_BASE_ADDR);
-        }
-
-        return 0;
-}
-arch_initcall(mxs_add_mxs_dma);