diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-17 15:08:12 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-03-07 19:29:38 +0100 |
| commit | ff255feba1c575311378a3d7a3867e46549c8aa6 (patch) | |
| tree | 458bd8b9de38fb7edcb8b643e0724084ef73a48c /arch/arm/mach-imx | |
| parent | 5ae30b477e9fb7319e2976fbf3521c0fac2625f1 (diff) | |
| download | kernel_samsung_smdk4412-ff255feba1c575311378a3d7a3867e46549c8aa6.tar.gz kernel_samsung_smdk4412-ff255feba1c575311378a3d7a3867e46549c8aa6.tar.bz2 kernel_samsung_smdk4412-ff255feba1c575311378a3d7a3867e46549c8aa6.zip | |
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')
| -rw-r--r-- | arch/arm/mach-imx/mm-imx1.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/mm-imx21.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/mm-imx27.c | 3 |
3 files changed, 9 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 @@ #include <mach/hardware.h> #include <mach/gpio.h> #include <mach/irqs.h> +#include <mach/iomux-v1.h> static struct map_desc imx_io_desc[] __initdata = { imx_map_entry(MX1, IO, MT_DEVICE), @@ -39,6 +40,8 @@ void __init imx1_init_early(void) { mxc_set_cpu_type(MXC_CPU_MX1); mxc_arch_reset_init(MX1_IO_ADDRESS(MX1_WDT_BASE_ADDR)); + imx_iomuxv1_init(MX1_IO_ADDRESS(MX1_GPIO_BASE_ADDR), + MX1_NUM_GPIO_PORT); } static struct mxc_gpio_port imx1_gpio_ports[] = { 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[] = { diff --git a/arch/arm/mach-imx/mm-imx27.c b/arch/arm/mach-imx/mm-imx27.c index e172e3ed3340..a6761a39f08c 100644 --- a/arch/arm/mach-imx/mm-imx27.c +++ b/arch/arm/mach-imx/mm-imx27.c @@ -26,6 +26,7 @@ #include <asm/mach/map.h> #include <mach/gpio.h> #include <mach/irqs.h> +#include <mach/iomux-v1.h> /* MX27 memory map definition */ static struct map_desc imx27_io_desc[] __initdata = { @@ -65,6 +66,8 @@ void __init imx27_init_early(void) { mxc_set_cpu_type(MXC_CPU_MX27); mxc_arch_reset_init(MX27_IO_ADDRESS(MX27_WDOG_BASE_ADDR)); + imx_iomuxv1_init(MX27_IO_ADDRESS(MX27_GPIO_BASE_ADDR), + MX27_NUM_GPIO_PORT); } static struct mxc_gpio_port imx27_gpio_ports[] = { |