Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[pandora-kernel.git] / arch / arm / plat-mxc / iomux-v1.c

diff --git a/arch/arm/plat-mxc/iomux-v1.c b/arch/arm/plat-mxc/iomux-v1.c
index 960a02c..3238c10 100644 (file)
--- 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);