ARM: mxc91231: use .init_early to initialize cpu type

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>

diff --git a/arch/arm/mach-mxc91231/magx-zn5.c b/arch/arm/mach-mxc91231/magx-zn5.c
index 395d83be8c98ed9b90590051f0744789d7a74778..f31a45e5a0b8696b31534ab65803048e8f01b616 100644 (file)
--- a/arch/arm/mach-mxc91231/magx-zn5.c
+++ b/arch/arm/mach-mxc91231/magx-zn5.c
@@ -53,9 +53,10 @@ struct sys_timer zn5_timer = {
 };
 
 MACHINE_START(MAGX_ZN5, "Motorola Zn5")
-       .boot_params    = MXC91231_PHYS_OFFSET + 0x100,
-       .map_io         = mxc91231_map_io,
-       .init_irq       = mxc91231_init_irq,
-       .timer          = &zn5_timer,
-       .init_machine   = zn5_init,
+       .boot_params = MXC91231_PHYS_OFFSET + 0x100,
+       .map_io = mxc91231_map_io,
+       .init_early = mxc91231_init_early,
+       .init_irq = mxc91231_init_irq,
+       .timer = &zn5_timer,
+       .init_machine = zn5_init,
 MACHINE_END

diff --git a/arch/arm/mach-mxc91231/mm.c b/arch/arm/mach-mxc91231/mm.c
index 7652c301da882ff569d145814b7bf7ee8c2c82a2..a77f6daf6a2628581ec901fa5360c90be13c4e63 100644 (file)
--- a/arch/arm/mach-mxc91231/mm.c
+++ b/arch/arm/mach-mxc91231/mm.c
@@ -45,11 +45,14 @@ static struct map_desc mxc91231_io_desc[] __initdata = {
  */
 void __init mxc91231_map_io(void)
 {
-       mxc_set_cpu_type(MXC_CPU_MXC91231);
-
        iotable_init(mxc91231_io_desc, ARRAY_SIZE(mxc91231_io_desc));
 }
 
+void __init mxc91231_init_early(void)
+{
+       mxc_set_cpu_type(MXC_CPU_MXC91231);
+}
+
 int mxc91231_register_gpios(void);
 
 void __init mxc91231_init_irq(void)

diff --git a/arch/arm/plat-mxc/include/mach/common.h b/arch/arm/plat-mxc/include/mach/common.h
index 4746b9a984a48b1b6e10c88a2d0c9c47c82dc1d2..a22ebe11a602aa817e06ef33608da4be79f72ade 100644 (file)
--- a/arch/arm/plat-mxc/include/mach/common.h
+++ b/arch/arm/plat-mxc/include/mach/common.h
@@ -33,6 +33,7 @@ extern void imx35_init_early(void);
 extern void imx50_init_early(void);
 extern void imx51_init_early(void);
 extern void imx53_init_early(void);
+extern void mxc91231_init_early(void);
 extern void mxc_init_irq(void __iomem *);
 extern void tzic_init_irq(void __iomem *);
 extern void mx1_init_irq(void);