34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From 132a7253fe87b1f4d71aab5abee3108a793234db Mon Sep 17 00:00:00 2001
|
|
From: Ralf Baechle <ralf@linux-mips.org>
|
|
Date: Tue, 13 Nov 2012 10:41:50 +0100
|
|
Subject: [PATCH] MIPS: Malta: Fix interupt number of CBUS UART.
|
|
|
|
The CBUS UART's interrupt number was wrong conflicting with the interrupt
|
|
being tied to the Intel PIIX4. Since the PIIX4's interrupt is registered
|
|
before the CBUS UART which is not being used on most systems this would
|
|
not be noticed.
|
|
|
|
Attempts to open the ttyS2 CBUS UART would result in:
|
|
|
|
genirq: Flags mismatch irq 18. 00000000 (serial) vs. 00010000 (XT-PIC cascade)
|
|
serial_link_irq_chain: request failed: -16 for irq: 18
|
|
|
|
Qemu was written to match the kernel so will need to be fixed also.
|
|
|
|
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
|
(cherry picked from commit fe2ccd4dcebd3c5e264af1705bb9b659972418cc)
|
|
---
|
|
arch/mips/mti-malta/malta-platform.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/arch/mips/mti-malta/malta-platform.c
|
|
+++ b/arch/mips/mti-malta/malta-platform.c
|
|
@@ -48,7 +48,7 @@ static struct plat_serial8250_port uart8
|
|
SMC_PORT(0x2F8, 3),
|
|
{
|
|
.mapbase = 0x1f000900, /* The CBUS UART */
|
|
- .irq = MIPS_CPU_IRQ_BASE + 2,
|
|
+ .irq = MIPS_CPU_IRQ_BASE + MIPSCPU_INT_MB2,
|
|
.uartclk = 3686400, /* Twice the usual clk! */
|
|
.iotype = UPIO_MEM32,
|
|
.flags = CBUS_UART_FLAGS,
|