diff options
author | Tony Lindgren <tony@atomide.com> | 2013-01-11 14:24:18 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-01-11 14:24:18 -0500 |
commit | b76c8b19b082c3fc84725de0d3ba5ee1f571c0ae (patch) | |
tree | 7681e38be4fa99573874a8796afbf54ded1feb0b /arch/arm/mach-omap2/omap4-common.c | |
parent | 816a65ef4ce1848d8083d9e198922ddafbe221f2 (diff) |
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 <ezequiel.garcia@free-electrons.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/omap4-common.c')
-rw-r--r-- | arch/arm/mach-omap2/omap4-common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c index 6897ae21bb82..ec11e49e08e5 100644 --- a/arch/arm/mach-omap2/omap4-common.c +++ b/arch/arm/mach-omap2/omap4-common.c | |||
@@ -225,7 +225,7 @@ static int __init omap_l2_cache_init(void) | |||
225 | 225 | ||
226 | return 0; | 226 | return 0; |
227 | } | 227 | } |
228 | early_initcall(omap_l2_cache_init); | 228 | omap_early_initcall(omap_l2_cache_init); |
229 | #endif | 229 | #endif |
230 | 230 | ||
231 | void __iomem *omap4_get_sar_ram_base(void) | 231 | void __iomem *omap4_get_sar_ram_base(void) |
@@ -253,7 +253,7 @@ static int __init omap4_sar_ram_init(void) | |||
253 | 253 | ||
254 | return 0; | 254 | return 0; |
255 | } | 255 | } |
256 | early_initcall(omap4_sar_ram_init); | 256 | omap_early_initcall(omap4_sar_ram_init); |
257 | 257 | ||
258 | static struct of_device_id irq_match[] __initdata = { | 258 | static struct of_device_id irq_match[] __initdata = { |
259 | { .compatible = "arm,cortex-a9-gic", .data = gic_of_init, }, | 259 | { .compatible = "arm,cortex-a9-gic", .data = gic_of_init, }, |