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-h2.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-h2.c')
-rw-r--r-- | arch/arm/mach-omap1/board-h2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index 197adb49dc5a..dd35efdefcf7 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c | |||
@@ -375,7 +375,6 @@ static void __init h2_init_irq(void) | |||
375 | omap1_init_common_hw(); | 375 | omap1_init_common_hw(); |
376 | omap_init_irq(); | 376 | omap_init_irq(); |
377 | omap_gpio_init(); | 377 | omap_gpio_init(); |
378 | h2_init_smc91x(); | ||
379 | } | 378 | } |
380 | 379 | ||
381 | static struct omap_usb_config h2_usb_config __initdata = { | 380 | static struct omap_usb_config h2_usb_config __initdata = { |
@@ -403,6 +402,8 @@ static struct omap_board_config_kernel h2_config[] __initdata = { | |||
403 | 402 | ||
404 | static void __init h2_init(void) | 403 | static void __init h2_init(void) |
405 | { | 404 | { |
405 | h2_init_smc91x(); | ||
406 | |||
406 | /* Here we assume the NOR boot config: NOR on CS3 (possibly swapped | 407 | /* Here we assume the NOR boot config: NOR on CS3 (possibly swapped |
407 | * to address 0 by a dip switch), NAND on CS2B. The NAND driver will | 408 | * to address 0 by a dip switch), NAND on CS2B. The NAND driver will |
408 | * notice whether a NAND chip is enabled at probe time. | 409 | * notice whether a NAND chip is enabled at probe time. |