diff options
author | Tarun Kanti DebBarma <tarun.kanti@ti.com> | 2012-03-29 11:41:01 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-03-29 11:41:01 -0400 |
commit | 46a0a5402f7b477bc98bf26596c2234f2ddbf473 (patch) | |
tree | a42f80deeecb3d59b2fa771c1ab031c68307f7b2 /arch/arm/mach-omap2/board-omap3evm.c | |
parent | a26d3c4fcd4bb875ae5adc32f27fab7a478bb00d (diff) |
ARM: OMAP: boards: Fix OMAP_GPIO_IRQ usage with gpio_to_irq()
The following commits change gpio-omap to use dynamic
IRQ allocation:
25db711 gpio/omap: Fix IRQ handling for SPARSE_IRQ
384ebe1 gpio/omap: Add DT support to GPIO driver
With dynamic allocation of IRQ the usage of OMAP_GPIO_IRQ
is no longer valid. We must be using gpio_to_irq() instead.
Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com>
[tony@atomide.com: updated comments]
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3evm.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3evm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index c775bead1497..20a47432bbd7 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c | |||
@@ -487,7 +487,6 @@ static struct platform_device omap3evm_wlan_regulator = { | |||
487 | }; | 487 | }; |
488 | 488 | ||
489 | struct wl12xx_platform_data omap3evm_wlan_data __initdata = { | 489 | struct wl12xx_platform_data omap3evm_wlan_data __initdata = { |
490 | .irq = OMAP_GPIO_IRQ(OMAP3EVM_WLAN_IRQ_GPIO), | ||
491 | .board_ref_clock = WL12XX_REFCLOCK_38, /* 38.4 MHz */ | 490 | .board_ref_clock = WL12XX_REFCLOCK_38, /* 38.4 MHz */ |
492 | }; | 491 | }; |
493 | #endif | 492 | #endif |
@@ -623,6 +622,7 @@ static void __init omap3_evm_wl12xx_init(void) | |||
623 | int ret; | 622 | int ret; |
624 | 623 | ||
625 | /* WL12xx WLAN Init */ | 624 | /* WL12xx WLAN Init */ |
625 | omap3evm_wlan_data.irq = gpio_to_irq(OMAP3EVM_WLAN_IRQ_GPIO); | ||
626 | ret = wl12xx_set_platform_data(&omap3evm_wlan_data); | 626 | ret = wl12xx_set_platform_data(&omap3evm_wlan_data); |
627 | if (ret) | 627 | if (ret) |
628 | pr_err("error setting wl12xx data: %d\n", ret); | 628 | pr_err("error setting wl12xx data: %d\n", ret); |