From b76c8b19b082c3fc84725de0d3ba5ee1f571c0ae Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Fri, 11 Jan 2013 11:24:18 -0800 Subject: 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: Ezequiel Garcia Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-omap2/drm.c') diff --git a/arch/arm/mach-omap2/drm.c b/arch/arm/mach-omap2/drm.c index 4c7566c7e24a..ab8a0e64c5f7 100644 --- a/arch/arm/mach-omap2/drm.c +++ b/arch/arm/mach-omap2/drm.c @@ -62,6 +62,6 @@ static int __init omap_init_drm(void) } -arch_initcall(omap_init_drm); +omap_arch_initcall(omap_init_drm); #endif -- cgit v1.2.3 From 59dc7a9cc2b0f58a28003274415133928b4cadd1 Mon Sep 17 00:00:00 2001 From: André Hentschel Date: Sat, 9 Feb 2013 19:20:57 -0800 Subject: ARM: OMAP2+: Include soc.h to drm.c to fix compiling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I needed this when compiling for pandaboard. The reason this is needed is that we are now using omap_initcalls to keep them multiplatform safe. Signed-off-by: André Hentschel [tony@atomide.com: updated comments] Signed-off-by: Tony Lindgren Signed-off-by: Olof Johansson --- arch/arm/mach-omap2/drm.c | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/mach-omap2/drm.c') diff --git a/arch/arm/mach-omap2/drm.c b/arch/arm/mach-omap2/drm.c index ab8a0e64c5f7..289e8cfb594c 100644 --- a/arch/arm/mach-omap2/drm.c +++ b/arch/arm/mach-omap2/drm.c @@ -27,6 +27,7 @@ #include "omap_device.h" #include "omap_hwmod.h" +#include "soc.h" #if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE) -- cgit v1.2.3