diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-17 09:08:12 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-03-07 13:29:38 -0500 |
commit | ff255feba1c575311378a3d7a3867e46549c8aa6 (patch) | |
tree | 458bd8b9de38fb7edcb8b643e0724084ef73a48c /arch/arm/mach-imx/mm-imx21.c | |
parent | 5ae30b477e9fb7319e2976fbf3521c0fac2625f1 (diff) |
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.c | 3 |
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 @@ | |||
26 | #include <asm/mach/map.h> | 26 | #include <asm/mach/map.h> |
27 | #include <mach/gpio.h> | 27 | #include <mach/gpio.h> |
28 | #include <mach/irqs.h> | 28 | #include <mach/irqs.h> |
29 | #include <mach/iomux-v1.h> | ||
29 | 30 | ||
30 | /* MX21 memory map definition */ | 31 | /* MX21 memory map definition */ |
31 | static struct map_desc imx21_io_desc[] __initdata = { | 32 | static struct map_desc imx21_io_desc[] __initdata = { |
@@ -65,6 +66,8 @@ void __init imx21_init_early(void) | |||
65 | { | 66 | { |
66 | mxc_set_cpu_type(MXC_CPU_MX21); | 67 | mxc_set_cpu_type(MXC_CPU_MX21); |
67 | mxc_arch_reset_init(MX21_IO_ADDRESS(MX21_WDOG_BASE_ADDR)); | 68 | mxc_arch_reset_init(MX21_IO_ADDRESS(MX21_WDOG_BASE_ADDR)); |
69 | imx_iomuxv1_init(MX21_IO_ADDRESS(MX21_GPIO_BASE_ADDR), | ||
70 | MX21_NUM_GPIO_PORT); | ||
68 | } | 71 | } |
69 | 72 | ||
70 | static struct mxc_gpio_port imx21_gpio_ports[] = { | 73 | static struct mxc_gpio_port imx21_gpio_ports[] = { |