diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2011-02-07 16:35:19 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-10 14:23:48 +0100 |
| commit | 3dac219615b88010601ee52e7b5fd1c32ef789ea (patch) | |
| tree | e2be4a211f7fe7df748e90a30d84b432895fc4c7 /arch/arm/mach-imx/mm-imx25.c | |
| parent | ARM: imx+mx3: convert to mc13xxx MFD (diff) | |
| download | linux-3dac219615b88010601ee52e7b5fd1c32ef789ea.tar.xz linux-3dac219615b88010601ee52e7b5fd1c32ef789ea.zip | |
ARM: imx: use .init_early to initialize cpu type and reset address
This used to be done in .map_io which is supposed to only setup the
memory mapping.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/mm-imx25.c')
| -rw-r--r-- | arch/arm/mach-imx/mm-imx25.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mm-imx25.c b/arch/arm/mach-imx/mm-imx25.c index 2edec6ce8fe7..09dd8d4e15bb 100644 --- a/arch/arm/mach-imx/mm-imx25.c +++ b/arch/arm/mach-imx/mm-imx25.c @@ -45,11 +45,14 @@ static struct map_desc mx25_io_desc[] __initdata = { */ void __init mx25_map_io(void) { + iotable_init(mx25_io_desc, ARRAY_SIZE(mx25_io_desc)); +} + +void __init imx25_init_early(void) +{ mxc_set_cpu_type(MXC_CPU_MX25); mxc_iomux_v3_init(MX25_IO_ADDRESS(MX25_IOMUXC_BASE_ADDR)); mxc_arch_reset_init(MX25_IO_ADDRESS(MX25_WDOG_BASE_ADDR)); - - iotable_init(mx25_io_desc, ARRAY_SIZE(mx25_io_desc)); } int imx25_register_gpios(void); |