diff options
| author | Tarun Kanti DebBarma | 2012-03-29 08:41:01 -0700 |
|---|---|---|
| committer | Tony Lindgren | 2012-03-29 08:41:01 -0700 |
| commit | 46a0a5402f7b477bc98bf26596c2234f2ddbf473 (patch) | |
| tree | a42f80deeecb3d59b2fa771c1ab031c68307f7b2 /arch/arm/mach-omap2/board-rx51-peripherals.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-rx51-peripherals.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-rx51-peripherals.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index 0a668916e3c1..2b6db67291be 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -169,7 +169,6 @@ static struct spi_board_info rx51_peripherals_spi_board_info[] __initdata = { .modalias = "tsc2005", .bus_num = 1, .chip_select = 0, - .irq = OMAP_GPIO_IRQ(RX51_TSC2005_IRQ_GPIO), .max_speed_hz = 6000000, .controller_data = &tsc2005_mcspi_config, .platform_data = &tsc2005_pdata, @@ -1121,6 +1120,8 @@ static void __init rx51_init_tsc2005(void) "tsc2005 reset"); if (r >= 0) { tsc2005_pdata.set_reset = rx51_tsc2005_set_reset; + rx51_peripherals_spi_board_info[RX51_SPI_TSC2005].irq = + gpio_to_irq(RX51_TSC2005_IRQ_GPIO); } else { printk(KERN_ERR "unable to get %s GPIO\n", "tsc2005 reset"); tsc2005_pdata.esd_timeout_ms = 0; |