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-4430sdp.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-4430sdp.c')
-rw-r--r-- | arch/arm/mach-omap2/board-4430sdp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 4e9071589bfb..a09c699ab85c 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c | |||
@@ -873,7 +873,6 @@ static void __init omap4_sdp4430_wifi_mux_init(void) | |||
873 | } | 873 | } |
874 | 874 | ||
875 | static struct wl12xx_platform_data omap4_sdp4430_wlan_data __initdata = { | 875 | static struct wl12xx_platform_data omap4_sdp4430_wlan_data __initdata = { |
876 | .irq = OMAP_GPIO_IRQ(GPIO_WIFI_IRQ), | ||
877 | .board_ref_clock = WL12XX_REFCLOCK_26, | 876 | .board_ref_clock = WL12XX_REFCLOCK_26, |
878 | .board_tcxo_clock = WL12XX_TCXOCLOCK_26, | 877 | .board_tcxo_clock = WL12XX_TCXOCLOCK_26, |
879 | }; | 878 | }; |
@@ -883,6 +882,7 @@ static void __init omap4_sdp4430_wifi_init(void) | |||
883 | int ret; | 882 | int ret; |
884 | 883 | ||
885 | omap4_sdp4430_wifi_mux_init(); | 884 | omap4_sdp4430_wifi_mux_init(); |
885 | omap4_sdp4430_wlan_data.irq = gpio_to_irq(GPIO_WIFI_IRQ); | ||
886 | ret = wl12xx_set_platform_data(&omap4_sdp4430_wlan_data); | 886 | ret = wl12xx_set_platform_data(&omap4_sdp4430_wlan_data); |
887 | if (ret) | 887 | if (ret) |
888 | pr_err("Error setting wl12xx data: %d\n", ret); | 888 | pr_err("Error setting wl12xx data: %d\n", ret); |