target/linux/malta/patches-3.6/001-MIPS-fix-CBUS-UART-irq.patch

   1 From 132a7253fe87b1f4d71aab5abee3108a793234db Mon Sep 17 00:00:00 2001
   2 From: Ralf Baechle <ralf@linux-mips.org>
   3 Date: Tue, 13 Nov 2012 10:41:50 +0100
   4 Subject: [PATCH] MIPS: Malta: Fix interupt number of CBUS UART.
   5
   6 The CBUS UART's interrupt number was wrong conflicting with the interrupt
   7 being tied to the Intel PIIX4.  Since the PIIX4's interrupt is registered
   8 before the CBUS UART which is not being used on most systems this would
   9 not be noticed.
  10
  11 Attempts to open the ttyS2 CBUS UART would result in:
  12
  13 genirq: Flags mismatch irq 18. 00000000 (serial) vs. 00010000 (XT-PIC cascade)
  14 serial_link_irq_chain: request failed: -16 for irq: 18
  15
  16 Qemu was written to match the kernel so will need to be fixed also.
  17
  18 Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  19 (cherry picked from commit fe2ccd4dcebd3c5e264af1705bb9b659972418cc)
  20 ---
  21  arch/mips/mti-malta/malta-platform.c | 2 +-
  22  1 file changed, 1 insertion(+), 1 deletion(-)
  23
  24 diff --git a/arch/mips/mti-malta/malta-platform.c b/arch/mips/mti-malta/malta-platform.c
  25 index a8beca8..a906153 100644
  26 --- a/arch/mips/mti-malta/malta-platform.c
  27 +++ b/arch/mips/mti-malta/malta-platform.c
  28 @@ -47,7 +47,7 @@ static struct plat_serial8250_port uart8250_data[] = {
  29         SMC_PORT(0x2F8, 3),
  30         {
  31                 .mapbase        = 0x1f000900,   /* The CBUS UART */
  32 -               .irq            = MIPS_CPU_IRQ_BASE + 2,
  33 +               .irq            = MIPS_CPU_IRQ_BASE + MIPSCPU_INT_MB2,
  34                 .uartclk        = 3686400,      /* Twice the usual clk! */
  35                 .iotype         = UPIO_MEM32,
  36                 .flags          = CBUS_UART_FLAGS,
  37 --
  38 1.7.11.7
  39