diff options
author | Tony Lindgren <tony@atomide.com> | 2010-12-07 19:26:55 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-12-07 19:26:55 -0500 |
commit | c2cdaffe0bb32015e84af8e31f73e620ba271165 (patch) | |
tree | 420ae7c0acec63eda182c7b4ceea1e39406bc41b /arch/arm/mach-omap1/board-innovator.c | |
parent | 7b045c96cd1405597a6a2e98bc53a4ac01d835b1 (diff) |
omap: Fix gpio_request calls to happen as arch_initcall
Looks like some boards are calling gpio_request from init_irq.
This will make the request_irq fail, as GPIO will be initialized
as postcore_initcall.
Reported-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/board-innovator.c')
-rw-r--r-- | arch/arm/mach-omap1/board-innovator.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c index dc2b86fd66c1..0feaa6731c7e 100644 --- a/arch/arm/mach-omap1/board-innovator.c +++ b/arch/arm/mach-omap1/board-innovator.c | |||
@@ -296,7 +296,6 @@ static void __init innovator_init_irq(void) | |||
296 | omap1510_fpga_init_irq(); | 296 | omap1510_fpga_init_irq(); |
297 | } | 297 | } |
298 | #endif | 298 | #endif |
299 | innovator_init_smc91x(); | ||
300 | } | 299 | } |
301 | 300 | ||
302 | #ifdef CONFIG_ARCH_OMAP15XX | 301 | #ifdef CONFIG_ARCH_OMAP15XX |
@@ -387,6 +386,8 @@ static struct omap_board_config_kernel innovator_config[] = { | |||
387 | 386 | ||
388 | static void __init innovator_init(void) | 387 | static void __init innovator_init(void) |
389 | { | 388 | { |
389 | innovator_init_smc91x(); | ||
390 | |||
390 | #ifdef CONFIG_ARCH_OMAP15XX | 391 | #ifdef CONFIG_ARCH_OMAP15XX |
391 | if (cpu_is_omap1510()) { | 392 | if (cpu_is_omap1510()) { |
392 | unsigned char reg; | 393 | unsigned char reg; |