aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Horsten <thomas@horsten.com>2008-06-14 02:32:42 +0100
committerRalf Baechle <ralf@linux-mips.org>2008-06-16 15:14:48 +0100
commit0c3bd83b0974238a5808d342663c6407512564d0 (patch)
tree36d29bd9e53278fd4d73d2cc533043bfdcc53f46
parentd6c3048cad3c9eb312c070e11fdbea56498255ed (diff)
downloadkernel_samsung_tuna-0c3bd83b0974238a5808d342663c6407512564d0.zip
kernel_samsung_tuna-0c3bd83b0974238a5808d342663c6407512564d0.tar.gz
kernel_samsung_tuna-0c3bd83b0974238a5808d342663c6407512564d0.tar.bz2
[MIPS] Lasat: bring back from the dead
After the common MIPS CPU interrupt controller (for irq0-7) was introduced the Lasat boards didn't get their interrupts right, so nothing worked. The old routines need to be offset by the new 8 hardware interrupts common to all MIPS CPU's. Signed-off-by: Thomas Horsten <thomas@horsten.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/lasat/interrupt.c2
-rw-r--r--include/asm-mips/lasat/serial.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c
index cfeab66..a56c150 100644
--- a/arch/mips/lasat/interrupt.c
+++ b/arch/mips/lasat/interrupt.c
@@ -34,11 +34,13 @@ static volatile int lasat_int_mask_shift;
void disable_lasat_irq(unsigned int irq_nr)
{
+ irq_nr -= LASAT_IRQ_BASE;
*lasat_int_mask &= ~(1 << irq_nr) << lasat_int_mask_shift;
}
void enable_lasat_irq(unsigned int irq_nr)
{
+ irq_nr -= LASAT_IRQ_BASE;
*lasat_int_mask |= (1 << irq_nr) << lasat_int_mask_shift;
}
diff --git a/include/asm-mips/lasat/serial.h b/include/asm-mips/lasat/serial.h
index bafe68b..1c37d70 100644
--- a/include/asm-mips/lasat/serial.h
+++ b/include/asm-mips/lasat/serial.h
@@ -4,10 +4,10 @@
#define LASAT_BASE_BAUD_100 (7372800 / 16)
#define LASAT_UART_REGS_BASE_100 0x1c8b0000
#define LASAT_UART_REGS_SHIFT_100 2
-#define LASATINT_UART_100 8
+#define LASATINT_UART_100 16
/* * LASAT 200 boards serial configuration */
#define LASAT_BASE_BAUD_200 (100000000 / 16 / 12)
#define LASAT_UART_REGS_BASE_200 (Vrc5074_PHYS_BASE + 0x0300)
#define LASAT_UART_REGS_SHIFT_200 3
-#define LASATINT_UART_200 13
+#define LASATINT_UART_200 21