fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / mips / gt64120 / momenco_ocelot / irq.c

diff --git a/arch/mips/gt64120/momenco_ocelot/irq.c b/arch/mips/gt64120/momenco_ocelot/irq.c
index 6812277..d929440 100644 (file)
--- a/arch/mips/gt64120/momenco_ocelot/irq.c
+++ b/arch/mips/gt64120/momenco_ocelot/irq.c
@@ -28,7 +28,6 @@
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
-#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/kernel_stat.h>
@@ -41,7 +40,7 @@
 #include <linux/timex.h>
 #include <linux/slab.h>
 #include <linux/random.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -49,9 +48,40 @@
 #include <asm/mipsregs.h>
 #include <asm/system.h>
 
-extern asmlinkage void ocelot_handle_int(void);
+asmlinkage void plat_irq_dispatch(void)
+{
+       unsigned int pending = read_c0_status() & read_c0_cause();
+
+       if (pending & STATUSF_IP2)              /* int0 hardware line */
+               do_IRQ(2);
+       else if (pending & STATUSF_IP3)         /* int1 hardware line */
+               do_IRQ(3);
+       else if (pending & STATUSF_IP4)         /* int2 hardware line */
+               do_IRQ(4);
+       else if (pending & STATUSF_IP5)         /* int3 hardware line */
+               do_IRQ(5);
+       else if (pending & STATUSF_IP6)         /* int4 hardware line */
+               do_IRQ(6);
+       else if (pending & STATUSF_IP7)         /* cpu timer */
+               do_IRQ(7);
+       else {
+               /*
+                * Now look at the extended interrupts
+                */
+               pending = (read_c0_cause() & (read_c0_intcontrol() << 8)) >> 16;
+
+               if (pending & STATUSF_IP8)              /* int6 hardware line */
+                       do_IRQ(8);
+               else if (pending & STATUSF_IP9)         /* int7 hardware line */
+                       do_IRQ(9);
+               else if (pending & STATUSF_IP10)        /* int8 hardware line */
+                       do_IRQ(10);
+               else if (pending & STATUSF_IP11)        /* int9 hardware line */
+                       do_IRQ(11);
+       }
+}
 
-void __init init_IRQ(void)
+void __init arch_init_irq(void)
 {
        /*
         * Clear all of the interrupts while we change the able around a bit.
@@ -60,16 +90,6 @@ void __init init_IRQ(void)
        clear_c0_status(ST0_IM);
        local_irq_disable();
 
-       /* Sets the first-level interrupt dispatcher. */
-       set_except_vector(0, ocelot_handle_int);
-
-       init_generic_irq();
        mips_cpu_irq_init(0);
        rm7k_cpu_irq_init(8);
-
-#ifdef CONFIG_KGDB
-       printk("start kgdb ...\n");
-       set_debug_traps();
-       breakpoint();   /* you may move this line to whereever you want :-) */
-#endif
 }