diff options
| author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2008-07-11 23:27:54 +0900 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2008-07-15 18:44:35 +0100 |
| commit | edcaf1a6a77315562e9781245cc8e028c9a921dc (patch) | |
| tree | a20a0a85071fa283c36db87a41d1a7e091a35781 /arch/mips/txx9/generic/irq_tx4927.c | |
| parent | 766891565bdaf605ea4aebe3e75de77e848254d0 (diff) | |
| download | op-kernel-dev-edcaf1a6a77315562e9781245cc8e028c9a921dc.zip op-kernel-dev-edcaf1a6a77315562e9781245cc8e028c9a921dc.tar.gz | |
[MIPS] TXx9: Make single kernel can support multiple boards
Make single kernel can be used on RBTX4927/37/38. Also make
some SoC-specific code independent from board-specific code.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/txx9/generic/irq_tx4927.c')
| -rw-r--r-- | arch/mips/txx9/generic/irq_tx4927.c | 33 |
1 files changed, 3 insertions, 30 deletions
diff --git a/arch/mips/txx9/generic/irq_tx4927.c b/arch/mips/txx9/generic/irq_tx4927.c index 685ecc2..6377bd8 100644 --- a/arch/mips/txx9/generic/irq_tx4927.c +++ b/arch/mips/txx9/generic/irq_tx4927.c @@ -26,39 +26,12 @@ #include <linux/init.h> #include <linux/interrupt.h> #include <asm/irq_cpu.h> -#include <asm/mipsregs.h> -#ifdef CONFIG_TOSHIBA_RBTX4927 -#include <asm/txx9/rbtx4927.h> -#endif +#include <asm/txx9/tx4927.h> void __init tx4927_irq_init(void) { mips_cpu_irq_init(); txx9_irq_init(TX4927_IRC_REG); - set_irq_chained_handler(TX4927_IRQ_NEST_PIC_ON_CP0, handle_simple_irq); -} - -asmlinkage void plat_irq_dispatch(void) -{ - unsigned int pending = read_c0_status() & read_c0_cause() & ST0_IM; - - if (pending & STATUSF_IP7) /* cpu timer */ - do_IRQ(TX4927_IRQ_CPU_TIMER); - else if (pending & STATUSF_IP2) { /* tx4927 pic */ - int irq = txx9_irq(); -#ifdef CONFIG_TOSHIBA_RBTX4927 - if (irq == TX4927_IRQ_NEST_EXT_ON_PIC) - irq = toshiba_rbtx4927_irq_nested(irq); -#endif - if (unlikely(irq < 0)) { - spurious_interrupt(); - return; - } - do_IRQ(irq); - } else if (pending & STATUSF_IP0) /* user line 0 */ - do_IRQ(TX4927_IRQ_USER0); - else if (pending & STATUSF_IP1) /* user line 1 */ - do_IRQ(TX4927_IRQ_USER1); - else - spurious_interrupt(); + set_irq_chained_handler(MIPS_CPU_IRQ_BASE + TX4927_IRC_INT, + handle_simple_irq); } |
