sh: Hook up remaining IRQ sources for R7780MP FPGA.

Signed-off-by: Masayuki Hosokawa <hosokawa@ace-jp.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 26 insertions, 13 deletions

diff --git a/arch/sh/boards/renesas/r7780rp/irq-r7780mp.c b/arch/sh/boards/renesas/r7780rp/irq-r7780mp.c
index 1f8f073f27be..68f0ad1b637d 100644
--- a/arch/sh/boards/renesas/r7780rp/irq-r7780mp.c
+++ b/arch/sh/boards/renesas/r7780rp/irq-r7780mp.c
@@ -18,31 +18,44 @@ enum {
         UNUSED = 0,
 
         /* board specific interrupt sources */
-        AX88796,          /* Ethernet controller */
-        CF,               /* Compact Flash */
-        PSW,              /* Push Switch */
-        EXT1,             /* EXT1n IRQ */
-        EXT4,             /* EXT4n IRQ */
+        CF,             /* Compact Flash */
+        TP,             /* Touch panel */
+        SCIF1,          /* FPGA SCIF1 */
+        SCIF0,          /* FPGA SCIF0 */
+        SMBUS,          /* SMBUS */
+        RTC,            /* RTC Alarm */
+        AX88796,        /* Ethernet controller */
+        PSW,            /* Push Switch */
+
+        /* external bus connector */
+        EXT1, EXT2, EXT4, EXT5, EXT6,
 };
 
 static struct intc_vect vectors[] __initdata = {
         INTC_IRQ(CF, IRQ_CF),
-        INTC_IRQ(PSW, IRQ_PSW),
+        INTC_IRQ(TP, IRQ_TP),
+        INTC_IRQ(SCIF1, IRQ_SCIF1),
+        INTC_IRQ(SCIF0, IRQ_SCIF0),
+        INTC_IRQ(SMBUS, IRQ_SMBUS),
+        INTC_IRQ(RTC, IRQ_RTC),
         INTC_IRQ(AX88796, IRQ_AX88796),
-        INTC_IRQ(EXT1, IRQ_EXT1),
-        INTC_IRQ(EXT4, IRQ_EXT4),
+        INTC_IRQ(PSW, IRQ_PSW),
+
+        INTC_IRQ(EXT1, IRQ_EXT1), INTC_IRQ(EXT2, IRQ_EXT2),
+        INTC_IRQ(EXT4, IRQ_EXT4), INTC_IRQ(EXT5, IRQ_EXT5),
+        INTC_IRQ(EXT6, IRQ_EXT6),
 };
 
 static struct intc_mask_reg mask_registers[] __initdata = {
         { 0xa4000000, 0, 16, /* IRLMSK */
-          { 0, 0, 0, 0, CF, 0, 0, 0,
-            0, 0, 0, EXT4, 0, EXT1, PSW, AX88796 } },
+          { SCIF0, SCIF1, RTC, 0, CF, 0, TP, SMBUS,
+            0, EXT6, EXT5, EXT4, EXT2, EXT1, PSW, AX88796 } },
 };
 
 static unsigned char irl2irq[HL_NR_IRL] __initdata = {
-        0, IRQ_CF, 0, 0,
-        0, 0, 0, 0,
-        0, IRQ_EXT4, 0, IRQ_EXT1,
+        0, IRQ_CF, IRQ_TP, IRQ_SCIF1,
+        IRQ_SCIF0, IRQ_SMBUS, IRQ_RTC, IRQ_EXT6,
+        IRQ_EXT5, IRQ_EXT4, IRQ_EXT2, IRQ_EXT1,
         0, IRQ_AX88796, IRQ_PSW,
 };