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

Commit b76c8b19 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Use omap initcalls 



This way the initcalls don't run on other SoCs on multiplatform
kernels. Otherwise we'll get something like this when booting
on vexpress:

omap_hwmod: _ensure_mpu_hwmod_is_setup: MPU initiator hwmod mpu not yet registered
...
WARNING: at arch/arm/mach-omap2/pm.c:82 _init_omap_device+0x74/0x94()
_init_omap_device: could not find omap_hwmod for mpu
...
omap-dma-engine omap-dma-engine: OMAP DMA engine driver
...

Tested-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 816a65ef

arch/arm/mach-omap2/board-omap3beagle.c

+1 −1
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ static int __init beagle_opp_init(void) 
	}

	return 0;

}

device_initcall(beagle_opp_init);

omap_device_initcall(beagle_opp_init);



static void __init omap3_beagle_init(void)

{

arch/arm/mach-omap2/board-rx51-video.c

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <video/omapdss.h>

#include <linux/platform_data/spi-omap2-mcspi.h>



#include "soc.h"

#include "board-rx51.h"



#include "mux.h"
@@ -85,5 +86,5 @@ static int __init rx51_video_init(void) 
	return 0;

}



subsys_initcall(rx51_video_init);

omap_subsys_initcall(rx51_video_init);

#endif /* defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE) */

arch/arm/mach-omap2/clock2xxx.c

+1 −1
Original line number Diff line number Diff line
@@ -52,6 +52,6 @@ static int __init omap2xxx_clk_arch_init(void) 
	return ret;

}



arch_initcall(omap2xxx_clk_arch_init);

omap_arch_initcall(omap2xxx_clk_arch_init);

arch/arm/mach-omap2/clock3xxx.c

+1 −1
Original line number Diff line number Diff line
@@ -94,6 +94,6 @@ static int __init omap3xxx_clk_arch_init(void) 
	return ret;

}



arch_initcall(omap3xxx_clk_arch_init);

omap_arch_initcall(omap3xxx_clk_arch_init);

arch/arm/mach-omap2/devices.c

+3 −3
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static int __init omap3_l3_init(void) 


	return IS_ERR(pdev) ? PTR_ERR(pdev) : 0;

}

postcore_initcall(omap3_l3_init);

omap_postcore_initcall(omap3_l3_init);



static int __init omap4_l3_init(void)

{
@@ -103,7 +103,7 @@ static int __init omap4_l3_init(void) 


	return IS_ERR(pdev) ? PTR_ERR(pdev) : 0;

}

postcore_initcall(omap4_l3_init);

omap_postcore_initcall(omap4_l3_init);



#if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE)
@@ -734,4 +734,4 @@ static int __init omap2_init_devices(void) 


	return 0;

}

arch_initcall(omap2_init_devices);
 
omap_arch_initcall(omap2_init_devices);