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-omap1/board-palmte.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-omap1/board-palmte.c')
-rw-r--r-- | arch/arm/mach-omap1/board-palmte.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c index 04efa7e61149..66e2a74d9861 100644 --- a/arch/arm/mach-omap1/board-palmte.c +++ b/arch/arm/mach-omap1/board-palmte.c | |||
@@ -220,7 +220,6 @@ static struct spi_board_info palmte_spi_info[] __initdata = { | |||
220 | .modalias = "tsc2102", | 220 | .modalias = "tsc2102", |
221 | .bus_num = 2, /* uWire (officially) */ | 221 | .bus_num = 2, /* uWire (officially) */ |
222 | .chip_select = 0, /* As opposed to 3 */ | 222 | .chip_select = 0, /* As opposed to 3 */ |
223 | .irq = OMAP_GPIO_IRQ(PALMTE_PINTDAV_GPIO), | ||
224 | .max_speed_hz = 8000000, | 223 | .max_speed_hz = 8000000, |
225 | }, | 224 | }, |
226 | }; | 225 | }; |
@@ -257,6 +256,7 @@ static void __init omap_palmte_init(void) | |||
257 | 256 | ||
258 | platform_add_devices(palmte_devices, ARRAY_SIZE(palmte_devices)); | 257 | platform_add_devices(palmte_devices, ARRAY_SIZE(palmte_devices)); |
259 | 258 | ||
259 | palmte_spi_info[0].irq = gpio_to_irq(PALMTE_PINTDAV_GPIO); | ||
260 | spi_register_board_info(palmte_spi_info, ARRAY_SIZE(palmte_spi_info)); | 260 | spi_register_board_info(palmte_spi_info, ARRAY_SIZE(palmte_spi_info)); |
261 | palmte_misc_gpio_setup(); | 261 | palmte_misc_gpio_setup(); |
262 | omap_serial_init(); | 262 | omap_serial_init(); |