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-imx1.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-imx1.c')
-rw-r--r-- | arch/arm/mach-imx/mm-imx1.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mm-imx1.c b/arch/arm/mach-imx/mm-imx1.c index 8613e440e48c..2e482ba5a0e7 100644 --- a/arch/arm/mach-imx/mm-imx1.c +++ b/arch/arm/mach-imx/mm-imx1.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <mach/hardware.h> | 25 | #include <mach/hardware.h> |
26 | #include <mach/gpio.h> | 26 | #include <mach/gpio.h> |
27 | #include <mach/irqs.h> | 27 | #include <mach/irqs.h> |
28 | #include <mach/iomux-v1.h> | ||
28 | 29 | ||
29 | static struct map_desc imx_io_desc[] __initdata = { | 30 | static struct map_desc imx_io_desc[] __initdata = { |
30 | imx_map_entry(MX1, IO, MT_DEVICE), | 31 | imx_map_entry(MX1, IO, MT_DEVICE), |
@@ -39,6 +40,8 @@ void __init imx1_init_early(void) | |||
39 | { | 40 | { |
40 | mxc_set_cpu_type(MXC_CPU_MX1); | 41 | mxc_set_cpu_type(MXC_CPU_MX1); |
41 | mxc_arch_reset_init(MX1_IO_ADDRESS(MX1_WDT_BASE_ADDR)); | 42 | mxc_arch_reset_init(MX1_IO_ADDRESS(MX1_WDT_BASE_ADDR)); |
43 | imx_iomuxv1_init(MX1_IO_ADDRESS(MX1_GPIO_BASE_ADDR), | ||
44 | MX1_NUM_GPIO_PORT); | ||
42 | } | 45 | } |
43 | 46 | ||
44 | static struct mxc_gpio_port imx1_gpio_ports[] = { | 47 | static struct mxc_gpio_port imx1_gpio_ports[] = { |