Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23b120cd authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Sascha Hauer
Browse files

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent ab130421

arch/arm/mach-mxc91231/magx-zn5.c

+6 −5
Original line number Original line Diff line number Diff line
@@ -55,6 +55,7 @@ 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_early = mxc91231_init_early,

	.init_irq = mxc91231_init_irq,

	.init_irq = mxc91231_init_irq,

	.timer = &zn5_timer,

	.timer = &zn5_timer,

	.init_machine = zn5_init,

	.init_machine = zn5_init,

arch/arm/mach-mxc91231/mm.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -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)

arch/arm/plat-mxc/include/mach/common.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -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);