Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[linux-2.6-omap-h63xx.git] / arch / sh / boards / se / 7206 / irq.c

diff --git a/arch/sh/boards/se/7206/irq.c b/arch/sh/boards/se/7206/irq.c
index 3fb0c5f5b23a3b72c620b8a0a4fe60bb4d044b41..27da88486f73bb4bf84aab19787a28ce6ac68702 100644 (file)
--- a/arch/sh/boards/se/7206/irq.c
+++ b/arch/sh/boards/se/7206/irq.c
@@ -10,6 +10,7 @@
 #include <linux/irq.h>
 #include <linux/io.h>
 #include <linux/irq.h>
+#include <linux/interrupt.h>
 #include <asm/se7206.h>
 
 #define INTSTS0 0x31800000
@@ -18,6 +19,13 @@
 #define INTMSK1 0x31800006
 #define INTSEL  0x31800008
 
+#define IRQ0_IRQ 64
+#define IRQ1_IRQ 65
+#define IRQ3_IRQ 67
+
+#define INTC_IPR01 0xfffe0818
+#define INTC_ICR1  0xfffe0802
+
 static void disable_se7206_irq(unsigned int irq)
 {
        unsigned short val;
@@ -39,7 +47,7 @@ static void disable_se7206_irq(unsigned int irq)
        case IRQ1_IRQ:
                msk0 |= 0x000f;
                break;
-       case IRQ2_IRQ:
+       case IRQ3_IRQ:
                msk0 |= 0x0f00;
                msk1 |= 0x00ff;
                break;
@@ -70,7 +78,7 @@ static void enable_se7206_irq(unsigned int irq)
        case IRQ1_IRQ:
                msk0 &= ~0x000f;
                break;
-       case IRQ2_IRQ:
+       case IRQ3_IRQ:
                msk0 &= ~0x0f00;
                msk1 &= ~0x00ff;
                break;
@@ -96,7 +104,7 @@ static void eoi_se7206_irq(unsigned int irq)
        case IRQ1_IRQ:
                sts0 &= ~0x000f;
                break;
-       case IRQ2_IRQ:
+       case IRQ3_IRQ:
                sts0 &= ~0x0f00;
                sts1 &= ~0x00ff;
                break;
@@ -106,7 +114,7 @@ static void eoi_se7206_irq(unsigned int irq)
 }
 
 static struct irq_chip se7206_irq_chip __read_mostly = {
-       .name           = "SE7206-FPGA-IRQ",
+       .name           = "SE7206-FPGA",
        .mask           = disable_se7206_irq,
        .unmask         = enable_se7206_irq,
        .mask_ack       = disable_se7206_irq,