summary refs log tree commit diff
path: root/arch/arm/mach-imx/mm-imx21.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-02-17 15:08:12 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-03-07 19:29:38 +0100
commitff255feba1c575311378a3d7a3867e46549c8aa6 (patch)
tree458bd8b9de38fb7edcb8b643e0724084ef73a48c /arch/arm/mach-imx/mm-imx21.c
parent5ae30b477e9fb7319e2976fbf3521c0fac2625f1 (diff)
downloadlinux-ff255feba1c575311378a3d7a3867e46549c8aa6.tar.gz
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>
Diffstat (limited to 'arch/arm/mach-imx/mm-imx21.c')
-rw-r--r--arch/arm/mach-imx/mm-imx21.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mm-imx21.c b/arch/arm/mach-imx/mm-imx21.c
index 6027e35ebfdb..7a0c500ac2c8 100644
--- a/arch/arm/mach-imx/mm-imx21.c
+++ b/arch/arm/mach-imx/mm-imx21.c
@@ -26,6 +26,7 @@
 #include <asm/mach/map.h>
 #include <mach/gpio.h>
 #include <mach/irqs.h>
+#include <mach/iomux-v1.h>
 
 /* MX21 memory map definition */
 static struct map_desc imx21_io_desc[] __initdata = {
@@ -65,6 +66,8 @@ void __init imx21_init_early(void)
 {
 	mxc_set_cpu_type(MXC_CPU_MX21);
 	mxc_arch_reset_init(MX21_IO_ADDRESS(MX21_WDOG_BASE_ADDR));
+	imx_iomuxv1_init(MX21_IO_ADDRESS(MX21_GPIO_BASE_ADDR),
+			MX21_NUM_GPIO_PORT);
 }
 
 static struct mxc_gpio_port imx21_gpio_ports[] = {