Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / arch / mips / lasat / interrupt.c

diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c
index 0887134..456be8f 100644 (file)
--- a/arch/mips/lasat/interrupt.c
+++ b/arch/mips/lasat/interrupt.c
@@ -15,7 +15,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
  *
- * Routines for generic manipulation of the interrupts found on the 
+ * Routines for generic manipulation of the interrupts found on the
  * Lasat boards.
  */
 #include <linux/init.h>
@@ -27,14 +27,13 @@
 #include <asm/bootinfo.h>
 #include <asm/irq.h>
 #include <asm/lasat/lasatint.h>
+#include <asm/time.h>
 #include <asm/gdb-stub.h>
 
 static volatile int *lasat_int_status = NULL;
 static volatile int *lasat_int_mask = NULL;
 static volatile int lasat_int_mask_shift;
 
-extern asmlinkage void lasatIRQ(void);
-
 void disable_lasat_irq(unsigned int irq_nr)
 {
        unsigned long flags;
@@ -70,15 +69,14 @@ static void end_lasat_irq(unsigned int irq)
                enable_lasat_irq(irq);
 }
 
-static struct hw_interrupt_type lasat_irq_type = {
-       "Lasat",
-       startup_lasat_irq,
-       shutdown_lasat_irq,
-       enable_lasat_irq,
-       disable_lasat_irq,
-       mask_and_ack_lasat_irq,
-       end_lasat_irq,
-       NULL
+static struct irq_chip lasat_irq_type = {
+       .typename = "Lasat",
+       .startup = startup_lasat_irq,
+       .shutdown = shutdown_lasat_irq,
+       .enable = enable_lasat_irq,
+       .disable = disable_lasat_irq,
+       .ack = mask_and_ack_lasat_irq,
+       .end = end_lasat_irq,
 };
 
 static inline int ls1bit32(unsigned int x)
@@ -101,7 +99,7 @@ static unsigned long get_int_status_100(void)
        return *lasat_int_status & *lasat_int_mask;
 }
 
-static unsigned long get_int_status_200(void) 
+static unsigned long get_int_status_200(void)
 {
        unsigned long int_status;
 
@@ -110,11 +108,17 @@ static unsigned long get_int_status_200(void)
        return int_status;
 }
 
-void lasat_hw0_irqdispatch(struct pt_regs *regs)
+asmlinkage void plat_irq_dispatch(struct pt_regs *regs)
 {
        unsigned long int_status;
+       unsigned int cause = read_c0_cause();
        int irq;
 
+       if (cause & CAUSEF_IP7) {       /* R4000 count / compare IRQ */
+               ll_timer_interrupt(7, regs);
+               return;
+       }
+
        int_status = get_int_status();
 
        /* if int_status == 0, then the interrupt has already been cleared */
@@ -125,12 +129,10 @@ void lasat_hw0_irqdispatch(struct pt_regs *regs)
        }
 }
 
-void __init init_IRQ(void)
+void __init arch_init_irq(void)
 {
        int i;
 
-       init_generic_irq();
-
        switch (mips_machtype) {
        case MACH_LASAT_100:
                lasat_int_status = (void *)LASAT_INT_STATUS_REG_100;
@@ -147,16 +149,13 @@ void __init init_IRQ(void)
                *lasat_int_mask &= 0xffff;
                break;
        default:
-               panic("init_IRQ: mips_machtype incorrect");
+               panic("arch_init_irq: mips_machtype incorrect");
        }
 
-       /* Now safe to set the exception vector. */
-       set_except_vector(0, lasatIRQ);
-
        for (i = 0; i <= LASATINT_END; i++) {
                irq_desc[i].status      = IRQ_DISABLED;
                irq_desc[i].action      = 0;
                irq_desc[i].depth       = 1;
-               irq_desc[i].handler     = &lasat_irq_type;
+               irq_desc[i].chip        = &lasat_irq_type;
        }
 }