ARM i.MX: iomux v1 initialization away from initcall

This saves us from soc level dispatching in generic files

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

2 files changed, 5 insertions, 21 deletions

diff --git a/arch/arm/plat-mxc/include/mach/iomux-v1.h b/arch/arm/plat-mxc/include/mach/iomux-v1.h
index 884f5753f279..c07d30210c57 100644
--- a/arch/arm/plat-mxc/include/mach/iomux-v1.h
+++ b/arch/arm/plat-mxc/include/mach/iomux-v1.h
@@ -100,4 +100,6 @@ extern int mxc_gpio_setup_multiple_pins(const int *pin_list, unsigned count,
                 const char *label);
 extern void mxc_gpio_release_multiple_pins(const int *pin_list, int count);
 
+extern int __init imx_iomuxv1_init(void __iomem *base, int numports);
+
 #endif /* __MACH_IOMUX_V1_H__ */
diff --git a/arch/arm/plat-mxc/iomux-v1.c b/arch/arm/plat-mxc/iomux-v1.c
index 960a02cbcbaf..3238c10d4e02 100644
--- a/arch/arm/plat-mxc/iomux-v1.c
+++ b/arch/arm/plat-mxc/iomux-v1.c
@@ -211,28 +211,10 @@ void mxc_gpio_release_multiple_pins(const int *pin_list, int count)
 }
 EXPORT_SYMBOL(mxc_gpio_release_multiple_pins);
 
-static int imx_iomuxv1_init(void)
+int __init imx_iomuxv1_init(void __iomem *base, int numports)
 {
-#ifdef CONFIG_ARCH_MX1
-        if (cpu_is_mx1()) {
-                imx_iomuxv1_baseaddr = MX1_IO_ADDRESS(MX1_GPIO_BASE_ADDR);
-                imx_iomuxv1_numports = MX1_NUM_GPIO_PORT;
-        } else
-#endif
-#ifdef CONFIG_MACH_MX21
-        if (cpu_is_mx21()) {
-                imx_iomuxv1_baseaddr = MX21_IO_ADDRESS(MX21_GPIO_BASE_ADDR);
-                imx_iomuxv1_numports = MX21_NUM_GPIO_PORT;
-        } else
-#endif
-#ifdef CONFIG_MACH_MX27
-        if (cpu_is_mx27()) {
-                imx_iomuxv1_baseaddr = MX27_IO_ADDRESS(MX27_GPIO_BASE_ADDR);
-                imx_iomuxv1_numports = MX27_NUM_GPIO_PORT;
-        } else
-#endif
-                return -ENODEV;
+        imx_iomuxv1_baseaddr = base;
+        imx_iomuxv1_numports = numports;
 
         return 0;
 }
-pure_initcall(imx_iomuxv1_init);