Merge branch 'for-3.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-mxs / devices / platform-dma.c

diff --git a/arch/arm/mach-mxs/devices/platform-dma.c b/arch/arm/mach-mxs/devices/platform-dma.c
index 6a0202b1016c7b287ccc04ea1d7e9e7c90116ee9..46824501de003505a6f7332ac819a65d67a5549e 100644 (file)
--- 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,22 +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 *apbh = "mxs-dma-apbh";
-       char *apbx = "mxs-dma-apbx";
-
-       if (cpu_is_mx23()) {
-               mxs_add_dma(apbh, MX23_APBH_DMA_BASE_ADDR);
-               mxs_add_dma(apbx, MX23_APBX_DMA_BASE_ADDR);
-       }
-
-       if (cpu_is_mx28()) {
-               mxs_add_dma(apbh, MX28_APBH_DMA_BASE_ADDR);
-               mxs_add_dma(apbx, MX28_APBX_DMA_BASE_ADDR);
-       }
-
-       return 0;
-}
-arch_initcall(mxs_add_mxs_dma);