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-omap4panda.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-omap4panda.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 28fc271f7031..449600712e19 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c | |||
@@ -199,7 +199,6 @@ static struct platform_device omap_vwlan_device = { | |||
199 | }; | 199 | }; |
200 | 200 | ||
201 | struct wl12xx_platform_data omap_panda_wlan_data __initdata = { | 201 | struct wl12xx_platform_data omap_panda_wlan_data __initdata = { |
202 | .irq = OMAP_GPIO_IRQ(GPIO_WIFI_IRQ), | ||
203 | /* PANDA ref clock is 38.4 MHz */ | 202 | /* PANDA ref clock is 38.4 MHz */ |
204 | .board_ref_clock = 2, | 203 | .board_ref_clock = 2, |
205 | }; | 204 | }; |
@@ -494,6 +493,7 @@ static void __init omap4_panda_init(void) | |||
494 | package = OMAP_PACKAGE_CBL; | 493 | package = OMAP_PACKAGE_CBL; |
495 | omap4_mux_init(board_mux, NULL, package); | 494 | omap4_mux_init(board_mux, NULL, package); |
496 | 495 | ||
496 | omap_panda_wlan_data.irq = gpio_to_irq(GPIO_WIFI_IRQ); | ||
497 | ret = wl12xx_set_platform_data(&omap_panda_wlan_data); | 497 | ret = wl12xx_set_platform_data(&omap_panda_wlan_data); |
498 | if (ret) | 498 | if (ret) |
499 | pr_err("error setting wl12xx data: %d\n", ret); | 499 | pr_err("error setting wl12xx data: %d\n", ret); |