Title: [9231] trunk: Blackfin: H8606: move 8250 irqflags to platform resources
- Revision
- 9231
- Author
- vapier
- Date
- 2010-10-17 05:19:07 -0400 (Sun, 17 Oct 2010)
Log Message
Blackfin: H8606: move 8250 irqflags to platform resources
Now that the common 8250 serial driver supports an "irqflags" field,
we don't need to patch in a custom define into the code.
Modified Paths
Diff
Modified: trunk/arch/blackfin/include/asm/serial.h (9230 => 9231)
--- trunk/arch/blackfin/include/asm/serial.h 2010-10-17 08:31:18 UTC (rev 9230)
+++ trunk/arch/blackfin/include/asm/serial.h 2010-10-17 09:19:07 UTC (rev 9231)
@@ -1,2 +1 @@
#include <asm-generic/serial.h>
-#define SERIAL_EXTRA_IRQ_FLAGS IRQF_TRIGGER_HIGH
Modified: trunk/arch/blackfin/mach-bf533/boards/H8606.c (9230 => 9231)
--- trunk/arch/blackfin/mach-bf533/boards/H8606.c 2010-10-17 08:31:18 UTC (rev 9230)
+++ trunk/arch/blackfin/mach-bf533/boards/H8606.c 2010-10-17 09:19:07 UTC (rev 9231)
@@ -347,6 +347,7 @@
.membase = (void *)0x20200000,
.mapbase = 0x20200000,
.irq = IRQ_PF8,
+ .irqflags = IRQF_TRIGGER_HIGH,
.flags = UPF_BOOT_AUTOCONF | UART_CONFIG_TYPE,
.iotype = UPIO_MEM,
.regshift = 1,
@@ -355,6 +356,7 @@
.membase = (void *)0x20200010,
.mapbase = 0x20200010,
.irq = IRQ_PF8,
+ .irqflags = IRQF_TRIGGER_HIGH,
.flags = UPF_BOOT_AUTOCONF | UART_CONFIG_TYPE,
.iotype = UPIO_MEM,
.regshift = 1,
Modified: trunk/drivers/serial/8250.c (9230 => 9231)
--- trunk/drivers/serial/8250.c 2010-10-17 08:31:18 UTC (rev 9230)
+++ trunk/drivers/serial/8250.c 2010-10-17 09:19:07 UTC (rev 9231)
@@ -1676,7 +1676,6 @@
i->head = &up->list;
spin_unlock_irq(&i->lock);
irq_flags |= up->port.irqflags;
- irq_flags |= SERIAL_EXTRA_IRQ_FLAGS;
ret = request_irq(up->port.irq, serial8250_interrupt,
irq_flags, "serial", i);
if (ret < 0)
Modified: trunk/drivers/serial/8250.h (9230 => 9231)
--- trunk/drivers/serial/8250.h 2010-10-17 08:31:18 UTC (rev 9230)
+++ trunk/drivers/serial/8250.h 2010-10-17 09:19:07 UTC (rev 9231)
@@ -78,7 +78,3 @@
#else
#define ALPHA_KLUDGE_MCR 0
#endif
-
-#ifndef SERIAL_EXTRA_IRQ_FLAGS
-#define SERIAL_EXTRA_IRQ_FLAGS 0
-#endif
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
