Skip to content

Commit

Permalink
ARM: mxc91231: use .init_early to initialize cpu type
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Uwe Kleine-König authored and Sascha Hauer committed Feb 10, 2011
1 parent ab13042 commit 23b120c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
11 changes: 6 additions & 5 deletions arch/arm/mach-mxc91231/magx-zn5.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 5 additions & 2 deletions arch/arm/mach-mxc91231/mm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions arch/arm/plat-mxc/include/mach/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 23b120c

Please sign in to comment.