Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Atsushi Nemoto and committed by
Ralf Baechle
a0e31fb0 8b32d6d0

+5 -1
+1 -1
arch/mips/txx9/jmr3927/setup.c
··· 85 85 static void __init jmr3927_time_init(void) 86 86 { 87 87 txx9_clockevent_init(TX3927_TMR_REG(0), 88 - TXX9_IRQ_BASE + JMR3927_IRQ_IRC_TMR(0), 88 + JMR3927_IRQ_IRC_TMR(0), 89 89 JMR3927_IMCLK); 90 90 txx9_clocksource_init(TX3927_TMR_REG(1), JMR3927_IMCLK); 91 91 }
+4
include/asm-mips/txx9irq.h
··· 14 14 #ifdef CONFIG_IRQ_CPU 15 15 #define TXX9_IRQ_BASE (MIPS_CPU_IRQ_BASE + 8) 16 16 #else 17 + #ifdef CONFIG_I8259 18 + #define TXX9_IRQ_BASE (I8259A_IRQ_BASE + 16) 19 + #else 17 20 #define TXX9_IRQ_BASE 0 21 + #endif 18 22 #endif 19 23 20 24 #ifdef CONFIG_CPU_TX39XX