提交 23b120cd 编写于 作者: U Uwe Kleine-König 提交者: Sascha Hauer

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: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>
上级 ab130421
...@@ -53,9 +53,10 @@ struct sys_timer zn5_timer = { ...@@ -53,9 +53,10 @@ struct sys_timer zn5_timer = {
}; };
MACHINE_START(MAGX_ZN5, "Motorola Zn5") MACHINE_START(MAGX_ZN5, "Motorola Zn5")
.boot_params = MXC91231_PHYS_OFFSET + 0x100, .boot_params = MXC91231_PHYS_OFFSET + 0x100,
.map_io = mxc91231_map_io, .map_io = mxc91231_map_io,
.init_irq = mxc91231_init_irq, .init_early = mxc91231_init_early,
.timer = &zn5_timer, .init_irq = mxc91231_init_irq,
.init_machine = zn5_init, .timer = &zn5_timer,
.init_machine = zn5_init,
MACHINE_END MACHINE_END
...@@ -45,11 +45,14 @@ static struct map_desc mxc91231_io_desc[] __initdata = { ...@@ -45,11 +45,14 @@ static struct map_desc mxc91231_io_desc[] __initdata = {
*/ */
void __init mxc91231_map_io(void) void __init mxc91231_map_io(void)
{ {
mxc_set_cpu_type(MXC_CPU_MXC91231);
iotable_init(mxc91231_io_desc, ARRAY_SIZE(mxc91231_io_desc)); 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); int mxc91231_register_gpios(void);
void __init mxc91231_init_irq(void) void __init mxc91231_init_irq(void)
......
...@@ -33,6 +33,7 @@ extern void imx35_init_early(void); ...@@ -33,6 +33,7 @@ extern void imx35_init_early(void);
extern void imx50_init_early(void); extern void imx50_init_early(void);
extern void imx51_init_early(void); extern void imx51_init_early(void);
extern void imx53_init_early(void); extern void imx53_init_early(void);
extern void mxc91231_init_early(void);
extern void mxc_init_irq(void __iomem *); extern void mxc_init_irq(void __iomem *);
extern void tzic_init_irq(void __iomem *); extern void tzic_init_irq(void __iomem *);
extern void mx1_init_irq(void); extern void mx1_init_irq(void);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册