summaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx/mm-imx1.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2011-02-07 18:35:19 +0300
committerSascha Hauer <s.hauer@pengutronix.de>2011-02-10 16:23:48 +0300
commit3dac219615b88010601ee52e7b5fd1c32ef789ea (patch)
treee2be4a211f7fe7df748e90a30d84b432895fc4c7 /arch/arm/mach-imx/mm-imx1.c
parent5836372e8a0ba5cc633f61bc0484ee20c86f4b36 (diff)
downloadlinux-3dac219615b88010601ee52e7b5fd1c32ef789ea.tar.xz
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-imx1.c')
-rw-r--r--arch/arm/mach-imx/mm-imx1.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mm-imx1.c b/arch/arm/mach-imx/mm-imx1.c
index 729ae0915af8..378c61b1e74c 100644
--- a/arch/arm/mach-imx/mm-imx1.c
+++ b/arch/arm/mach-imx/mm-imx1.c
@@ -30,10 +30,13 @@ static struct map_desc imx_io_desc[] __initdata = {
void __init mx1_map_io(void)
{
+ iotable_init(imx_io_desc, ARRAY_SIZE(imx_io_desc));
+}
+
+void __init imx1_init_early(void)
+{
mxc_set_cpu_type(MXC_CPU_MX1);
mxc_arch_reset_init(MX1_IO_ADDRESS(MX1_WDT_BASE_ADDR));
-
- iotable_init(imx_io_desc, ARRAY_SIZE(imx_io_desc));
}
int imx1_register_gpios(void);