diff options
| author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2008-07-23 19:25:12 +0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2008-07-31 00:54:34 +0400 |
| commit | a0e31fb09056224c5d6fef09d25cb96b6149aa7c (patch) | |
| tree | 1019fd90a1160c066f1bf305221bdd41fd26f610 | |
| parent | 8b32d6d00ca890ebb204da1260247c11bba042b3 (diff) | |
| download | linux-a0e31fb09056224c5d6fef09d25cb96b6149aa7c.tar.xz | |
[MIPS] TXx9: Fix JMR3927 irq numbers
* 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>
| -rw-r--r-- | arch/mips/txx9/jmr3927/setup.c | 2 | ||||
| -rw-r--r-- | include/asm-mips/txx9irq.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/mips/txx9/jmr3927/setup.c b/arch/mips/txx9/jmr3927/setup.c index 03647ebe4130..57dc91e7afa6 100644 --- a/arch/mips/txx9/jmr3927/setup.c +++ b/arch/mips/txx9/jmr3927/setup.c @@ -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); } diff --git a/include/asm-mips/txx9irq.h b/include/asm-mips/txx9irq.h index 1c439e51b875..5620879be37f 100644 --- a/include/asm-mips/txx9irq.h +++ b/include/asm-mips/txx9irq.h @@ -14,8 +14,12 @@ #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 |