[MIPS] TXx9: Fix JMR3927 irq numbers
authorAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Wed, 23 Jul 2008 15:25:12 +0000 (00:25 +0900)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 30 Jul 2008 20:54:34 +0000 (21:54 +0100)
* Fix wrong txx9_clockevent interrupt number
* Fix TXX9_IRQ_BASE for JMR3927+FPCIB case

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/txx9/jmr3927/setup.c
include/asm-mips/txx9irq.h

index 03647ebe41300a492bb73e1893cb2847b1e34081..57dc91e7afa6d596d987c71f60aa720f659e2651 100644 (file)
@@ -85,7 +85,7 @@ static void jmr3927_machine_power_off(void)
 static void __init jmr3927_time_init(void)
 {
        txx9_clockevent_init(TX3927_TMR_REG(0),
-                            TXX9_IRQ_BASE + JMR3927_IRQ_IRC_TMR(0),
+                            JMR3927_IRQ_IRC_TMR(0),
                             JMR3927_IMCLK);
        txx9_clocksource_init(TX3927_TMR_REG(1), JMR3927_IMCLK);
 }
index 1c439e51b875ed8d6b427334f16579aff23e2273..5620879be37fb632310fe137264e2ef525cf3b9d 100644 (file)
 #ifdef CONFIG_IRQ_CPU
 #define TXX9_IRQ_BASE  (MIPS_CPU_IRQ_BASE + 8)
 #else
+#ifdef CONFIG_I8259
+#define TXX9_IRQ_BASE  (I8259A_IRQ_BASE + 16)
+#else
 #define TXX9_IRQ_BASE  0
 #endif
+#endif
 
 #ifdef CONFIG_CPU_TX39XX
 #define TXx9_MAX_IR 16