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/gpio.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/gpio.c')
-rw-r--r-- | arch/arm/mach-omap2/gpio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c index 399acabc3d0b..40950f5af1f0 100644 --- a/arch/arm/mach-omap2/gpio.c +++ b/arch/arm/mach-omap2/gpio.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/of.h> | 23 | #include <linux/of.h> |
24 | #include <linux/platform_data/gpio-omap.h> | 24 | #include <linux/platform_data/gpio-omap.h> |
25 | 25 | ||
26 | #include "soc.h" | ||
26 | #include "omap_hwmod.h" | 27 | #include "omap_hwmod.h" |
27 | #include "omap_device.h" | 28 | #include "omap_device.h" |
28 | #include "omap-pm.h" | 29 | #include "omap-pm.h" |
@@ -147,7 +148,7 @@ static int __init omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) | |||
147 | /* | 148 | /* |
148 | * gpio_init needs to be done before | 149 | * gpio_init needs to be done before |
149 | * machine_init functions access gpio APIs. | 150 | * machine_init functions access gpio APIs. |
150 | * Hence gpio_init is a postcore_initcall. | 151 | * Hence gpio_init is a omap_postcore_initcall. |
151 | */ | 152 | */ |
152 | static int __init omap2_gpio_init(void) | 153 | static int __init omap2_gpio_init(void) |
153 | { | 154 | { |
@@ -157,4 +158,4 @@ static int __init omap2_gpio_init(void) | |||
157 | 158 | ||
158 | return omap_hwmod_for_each_by_class("gpio", omap2_gpio_dev_init, NULL); | 159 | return omap_hwmod_for_each_by_class("gpio", omap2_gpio_dev_init, NULL); |
159 | } | 160 | } |
160 | postcore_initcall(omap2_gpio_init); | 161 | omap_postcore_initcall(omap2_gpio_init); |