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-zoom-debugboard.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-zoom-debugboard.c')
-rw-r--r-- | arch/arm/mach-omap2/board-zoom-debugboard.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c index 369c2eb7715b..1e8540eabde9 100644 --- a/arch/arm/mach-omap2/board-zoom-debugboard.c +++ b/arch/arm/mach-omap2/board-zoom-debugboard.c | |||
@@ -43,7 +43,6 @@ static inline void __init zoom_init_smsc911x(void) | |||
43 | static struct plat_serial8250_port serial_platform_data[] = { | 43 | static struct plat_serial8250_port serial_platform_data[] = { |
44 | { | 44 | { |
45 | .mapbase = ZOOM_UART_BASE, | 45 | .mapbase = ZOOM_UART_BASE, |
46 | .irq = OMAP_GPIO_IRQ(102), | ||
47 | .flags = UPF_BOOT_AUTOCONF|UPF_IOREMAP|UPF_SHARE_IRQ, | 46 | .flags = UPF_BOOT_AUTOCONF|UPF_IOREMAP|UPF_SHARE_IRQ, |
48 | .irqflags = IRQF_SHARED | IRQF_TRIGGER_RISING, | 47 | .irqflags = IRQF_SHARED | IRQF_TRIGGER_RISING, |
49 | .iotype = UPIO_MEM, | 48 | .iotype = UPIO_MEM, |
@@ -89,6 +88,8 @@ static inline void __init zoom_init_quaduart(void) | |||
89 | if (gpio_request_one(quart_gpio, GPIOF_IN, "TL16CP754C GPIO") < 0) | 88 | if (gpio_request_one(quart_gpio, GPIOF_IN, "TL16CP754C GPIO") < 0) |
90 | printk(KERN_ERR "Failed to request GPIO%d for TL16CP754C\n", | 89 | printk(KERN_ERR "Failed to request GPIO%d for TL16CP754C\n", |
91 | quart_gpio); | 90 | quart_gpio); |
91 | |||
92 | serial_platform_data[0].irq = gpio_to_irq(102); | ||
92 | } | 93 | } |
93 | 94 | ||
94 | static inline int omap_zoom_debugboard_detect(void) | 95 | static inline int omap_zoom_debugboard_detect(void) |