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/gpmc.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/gpmc.c')
-rw-r--r-- | arch/arm/mach-omap2/gpmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 8033cb747c86..972a6fc466ca 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c | |||
@@ -1205,7 +1205,7 @@ static __exit void gpmc_exit(void) | |||
1205 | 1205 | ||
1206 | } | 1206 | } |
1207 | 1207 | ||
1208 | postcore_initcall(gpmc_init); | 1208 | omap_postcore_initcall(gpmc_init); |
1209 | module_exit(gpmc_exit); | 1209 | module_exit(gpmc_exit); |
1210 | 1210 | ||
1211 | static int __init omap_gpmc_init(void) | 1211 | static int __init omap_gpmc_init(void) |
@@ -1225,7 +1225,7 @@ static int __init omap_gpmc_init(void) | |||
1225 | 1225 | ||
1226 | return IS_ERR(pdev) ? PTR_ERR(pdev) : 0; | 1226 | return IS_ERR(pdev) ? PTR_ERR(pdev) : 0; |
1227 | } | 1227 | } |
1228 | postcore_initcall(omap_gpmc_init); | 1228 | omap_postcore_initcall(omap_gpmc_init); |
1229 | 1229 | ||
1230 | static irqreturn_t gpmc_handle_irq(int irq, void *dev) | 1230 | static irqreturn_t gpmc_handle_irq(int irq, void *dev) |
1231 | { | 1231 | { |