diff options
| author | Vikram Pandita <vikram.pandita@ti.com> | 2009-08-28 11:24:08 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-08-28 11:24:08 -0700 |
| commit | c426df87d8197cde077d03c808f52e3a17045b09 (patch) | |
| tree | 89a398f73f9d78eab55b7eb9864912aee38629a4 | |
| parent | 14e0e6796a0d460ac6f7727616161dc317bbbf3a (diff) | |
| download | kernel_samsung_smdk4412-c426df87d8197cde077d03c808f52e3a17045b09.zip kernel_samsung_smdk4412-c426df87d8197cde077d03c808f52e3a17045b09.tar.gz kernel_samsung_smdk4412-c426df87d8197cde077d03c808f52e3a17045b09.tar.bz2 | |
OMAP2/3: Pass irqflags to 8250 driver
Pass irqflags to 8250 driver with platform_data. At least Zoom2 has
IRQF_TRIGGER_RISING requirement for the 8250 GPIO irq.
This patch is dependent on 8250 driver changes getting accepted upstream:
http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=commit;h=7053133124d5cdf207c1168c7a0c582a18e12ea7
Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap2/board-zoom-debugboard.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/serial.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c index bac5c43..f546063 100644 --- a/arch/arm/mach-omap2/board-zoom-debugboard.c +++ b/arch/arm/mach-omap2/board-zoom-debugboard.c @@ -12,6 +12,7 @@ #include <linux/gpio.h> #include <linux/serial_8250.h> #include <linux/smsc911x.h> +#include <linux/interrupt.h> #include <mach/gpmc.h> @@ -84,6 +85,7 @@ static struct plat_serial8250_port serial_platform_data[] = { .mapbase = 0x10000000, .irq = OMAP_GPIO_IRQ(102), .flags = UPF_BOOT_AUTOCONF|UPF_IOREMAP|UPF_SHARE_IRQ, + .irqflags = IRQF_SHARED | IRQF_TRIGGER_RISING, .iotype = UPIO_MEM, .regshift = 1, .uartclk = QUART_CLK, diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index 409b033..dd3c735 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -460,7 +460,7 @@ static void omap_uart_idle_init(struct omap_uart_state *uart) uart->padconf = 0; } - p->flags |= UPF_SHARE_IRQ; + p->irqflags |= IRQF_SHARED; ret = request_irq(p->irq, omap_uart_interrupt, IRQF_SHARED, "serial idle", (void *)uart); WARN_ON(ret); |