From: Atsushi Nemoto Date: Wed, 23 Jul 2008 15:25:12 +0000 (+0900) Subject: [MIPS] TXx9: Fix JMR3927 irq numbers X-Git-Tag: v2.6.27-rc2~114^2~16 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=a0e31fb09056224c5d6fef09d25cb96b6149aa7c;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: Ralf Baechle --- diff --git a/arch/mips/txx9/jmr3927/setup.c b/arch/mips/txx9/jmr3927/setup.c index 03647ebe413..57dc91e7afa 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 1c439e51b87..5620879be37 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