aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mm-imx21.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2011-02-07 10:35:19 -0500
committerSascha Hauer <s.hauer@pengutronix.de>2011-02-10 08:23:48 -0500
commit3dac219615b88010601ee52e7b5fd1c32ef789ea (patch)
treee2be4a211f7fe7df748e90a30d84b432895fc4c7 /arch/arm/mach-imx/mm-imx21.c
parent5836372e8a0ba5cc633f61bc0484ee20c86f4b36 (diff)
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-imx21.c')
-rw-r--r--arch/arm/mach-imx/mm-imx21.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mm-imx21.c b/arch/arm/mach-imx/mm-imx21.c
index e728af81d1b..b6152c6b5b2 100644
--- a/arch/arm/mach-imx/mm-imx21.c
+++ b/arch/arm/mach-imx/mm-imx21.c
@@ -56,10 +56,13 @@ static struct map_desc imx21_io_desc[] __initdata = {
56 */ 56 */
57void __init mx21_map_io(void) 57void __init mx21_map_io(void)
58{ 58{
59 iotable_init(imx21_io_desc, ARRAY_SIZE(imx21_io_desc));
60}
61
62void __init imx21_init_early(void)
63{
59 mxc_set_cpu_type(MXC_CPU_MX21); 64 mxc_set_cpu_type(MXC_CPU_MX21);
60 mxc_arch_reset_init(MX21_IO_ADDRESS(MX21_WDOG_BASE_ADDR)); 65 mxc_arch_reset_init(MX21_IO_ADDRESS(MX21_WDOG_BASE_ADDR));
61
62 iotable_init(imx21_io_desc, ARRAY_SIZE(imx21_io_desc));
63} 66}
64 67
65int imx21_register_gpios(void); 68int imx21_register_gpios(void);