Commit 4323e9f7 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap2/3: Fix initcalls for multi-omap 



Otherwise the wrong initcalls can run.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 140455fa

arch/arm/mach-omap2/devices.c

+6 −1
Original line number Diff line number Diff line
@@ -510,7 +510,12 @@ static struct platform_device dummy_pdev = { 
 **/

static void __init omap_hsmmc_reset(void)

{

	u32 i, nr_controllers = cpu_is_omap44xx() ? OMAP44XX_NR_MMC :

	u32 i, nr_controllers;



	if (cpu_is_omap242x())

		return;



	nr_controllers = cpu_is_omap44xx() ? OMAP44XX_NR_MMC :

		(cpu_is_omap34xx() ? OMAP34XX_NR_MMC : OMAP24XX_NR_MMC);



	for (i = 0; i < nr_controllers; i++) {

arch/arm/mach-omap2/emu.c

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ static struct amba_device omap3_etm_device = { 


static int __init emu_init(void)

{

	if (!cpu_is_omap34xx())

		return -ENODEV;



	amba_device_register(&omap3_etb_device, &iomem_resource);

	amba_device_register(&omap3_etm_device, &iomem_resource);