3 files changed, 17 insertions, 85 deletions

diff --git a/arch/mips/philips/pnx8550/common/Makefile b/arch/mips/philips/pnx8550/common/Makefile
index 6e38f3bc443c..b7c638166e9f 100644
--- a/arch/mips/philips/pnx8550/common/Makefile
+++ b/arch/mips/philips/pnx8550/common/Makefile
@@ -22,6 +22,6 @@
 # under Linux.
 #
 
-obj-y := setup.o prom.o mipsIRQ.o int.o reset.o time.o proc.o platform.o
+obj-y := setup.o prom.o int.o reset.o time.o proc.o platform.o
 obj-$(CONFIG_PCI) += pci.o
 obj-$(CONFIG_KGDB) += gdb_hook.o
diff --git a/arch/mips/philips/pnx8550/common/int.c b/arch/mips/philips/pnx8550/common/int.c
index c500e2d41f2c..39ee6314f627 100644
--- a/arch/mips/philips/pnx8550/common/int.c
+++ b/arch/mips/philips/pnx8550/common/int.c
@@ -38,8 +38,6 @@
 #include <int.h>
 #include <uart.h>
 
-extern asmlinkage void cp0_irqdispatch(void);
-
 static DEFINE_SPINLOCK(irq_lock);
 
 /* default prio for interrupts */
@@ -55,7 +53,7 @@ static char gic_prio[PNX8550_INT_GIC_TOTINT] = {
         1                       //  70
 };
 
-void hw0_irqdispatch(int irq, struct pt_regs *regs)
+static void hw0_irqdispatch(int irq, struct pt_regs *regs)
 {
         /* find out which interrupt */
         irq = PNX8550_GIC_VECTOR_0 >> 3;
@@ -68,7 +66,7 @@ void hw0_irqdispatch(int irq, struct pt_regs *regs)
 }
 
 
-void timer_irqdispatch(int irq, struct pt_regs *regs)
+static void timer_irqdispatch(int irq, struct pt_regs *regs)
 {
         irq = (0x01c0 & read_c0_config7()) >> 6;
 
@@ -88,6 +86,20 @@ void timer_irqdispatch(int irq, struct pt_regs *regs)
         }
 }
 
+asmlinkage void plat_irq_dispatch(struct pt_regs *regs)
+{
+        unsigned int pending = read_c0_status() & read_c0_cause();
+
+        if (pending & STATUSF_IP2)
+                do_IRQ(2, regs);
+        else if (pending & STATUSF_IP7) {
+                if (read_c0_config7() & 0x01c0)
+                        timer_irqdispatch(7, regs);
+        }
+
+        spurious_interrupt(regs);
+}
+
 static inline void modify_cp0_intmask(unsigned clr_mask, unsigned set_mask)
 {
         unsigned long status = read_c0_status();
@@ -223,9 +235,6 @@ void __init arch_init_irq(void)
         int i;
         int configPR;
 
-        /* init of cp0 interrupts */
-        set_except_vector(0, cp0_irqdispatch);
-
         for (i = 0; i < PNX8550_INT_CP0_TOTINT; i++) {
                 irq_desc[i].handler = &level_irq_type;
                 pnx8550_ack(i); /* mask the irq just in case  */
diff --git a/arch/mips/philips/pnx8550/common/mipsIRQ.S b/arch/mips/philips/pnx8550/common/mipsIRQ.S
deleted file mode 100644
index e049a719f83d..000000000000
--- a/arch/mips/philips/pnx8550/common/mipsIRQ.S
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2002 Philips, Inc. All rights.
- * Copyright (c) 2002 Red Hat, Inc. All rights.
- *
- * This software may be freely redistributed under the terms of the
- * GNU General Public License.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Based upon arch/mips/galileo-boards/ev64240/int-handler.S
- *
- */
-#include <asm/asm.h>
-#include <asm/mipsregs.h>
-#include <asm/addrspace.h>
-#include <asm/regdef.h>
-#include <asm/stackframe.h>
-
-/*
- * cp0_irqdispatch
- *
- *    Code to handle in-core interrupt exception.
- */
-
-                .align  5
-                .set    reorder
-                .set    noat
-                NESTED(cp0_irqdispatch, PT_SIZE, sp)
-                SAVE_ALL
-                CLI
-                .set    at
-                mfc0    t0,CP0_CAUSE
-                mfc0    t2,CP0_STATUS
-
-                and     t0,t2
-
-                andi    t1,t0,STATUSF_IP2 /* int0 hardware line */
-                bnez    t1,ll_hw0_irq
-                nop
-
-                andi    t1,t0,STATUSF_IP7 /* int5 hardware line */
-                bnez    t1,ll_timer_irq
-                nop
-
-                /* wrong alarm or masked ... */
-
-                jal     spurious_interrupt
-                nop
-                j       ret_from_irq
-                END(cp0_irqdispatch)
-
-                .align  5
-                .set    reorder
-ll_hw0_irq:
-                li      a0,2
-                move    a1,sp
-                jal     hw0_irqdispatch
-                nop
-                j       ret_from_irq
-                nop
-
-                .align  5
-                .set    reorder
-ll_timer_irq:
-                mfc0    t3,CP0_CONFIG,7
-                andi    t4,t3,0x01c0
-                beqz    t4,ll_timer_out
-                nop
-                li      a0,7
-                move    a1,sp
-                jal     timer_irqdispatch
-                nop
-
-ll_timer_out:   j       ret_from_irq
-                nop