sh: multiple vectors per irq - sh7263.

Convert over the SH7263 IRQ groups as well.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
index 18d127ca0e6284d59235cff897443e01d85f32cc..820dfb2e8656354e7972ccfc55371695c53e72f4 100644 (file)
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
@@ -34,15 +34,11 @@ enum {
        SSI0_SSII, SSI1_SSII, SSI2_SSII, SSI3_SSII,
 
        /* ROM-DEC, SDHI, SRC, and IEB are SH7263 specific */
-       ROMDEC_ISY, ROMDEC_IERR, ROMDEC_IARG, ROMDEC_ISEC, ROMDEC_IBUF,
-       ROMDEC_IREADY,
-
-       FLCTL, SDHI3, SDHI0, SDHI1, RTC, RCAN0, RCAN1,
-
-       SRC_OVF, SRC_ODFI, SRC_IDEI, IEBI,
+       ROMDEC, FLCTL, SDHI, RTC, RCAN0, RCAN1,
+       SRC, IEBI,
 
        /* interrupt groups */
-       PINT, ROMDEC, SDHI, SRC
+       PINT,
 };
 
 static struct intc_vect vectors[] __initdata = {
@@ -119,14 +115,15 @@ static struct intc_vect vectors[] __initdata = {
 
        /* SH7263-specific trash */
 #ifdef CONFIG_CPU_SUBTYPE_SH7263
-       INTC_IRQ(ROMDEC_ISY, 218), INTC_IRQ(ROMDEC_IERR, 219),
-       INTC_IRQ(ROMDEC_IARG, 220), INTC_IRQ(ROMDEC_ISEC, 221),
-       INTC_IRQ(ROMDEC_IBUF, 222), INTC_IRQ(ROMDEC_IREADY, 223),
+       INTC_IRQ(ROMDEC, 218), INTC_IRQ(ROMDEC, 219),
+       INTC_IRQ(ROMDEC, 220), INTC_IRQ(ROMDEC, 221),
+       INTC_IRQ(ROMDEC, 222), INTC_IRQ(ROMDEC, 223),
 
-       INTC_IRQ(SDHI3, 228), INTC_IRQ(SDHI0, 229), INTC_IRQ(SDHI1, 230),
+       INTC_IRQ(SDHI, 228), INTC_IRQ(SDHI, 229),
+       INTC_IRQ(SDHI, 230),
 
-       INTC_IRQ(SRC_OVF, 244), INTC_IRQ(SRC_ODFI, 245),
-       INTC_IRQ(SRC_IDEI, 246),
+       INTC_IRQ(SRC, 244), INTC_IRQ(SRC, 245),
+       INTC_IRQ(SRC, 246),
 
        INTC_IRQ(IEBI, 247),
 #endif
@@ -135,12 +132,6 @@ static struct intc_vect vectors[] __initdata = {
 static struct intc_group groups[] __initdata = {
        INTC_GROUP(PINT, PINT0, PINT1, PINT2, PINT3,
                   PINT4, PINT5, PINT6, PINT7),
-#ifdef CONFIG_CPU_SUBTYPE_SH7263
-       INTC_GROUP(ROMDEC, ROMDEC_ISY, ROMDEC_IERR, ROMDEC_IARG,
-                  ROMDEC_ISEC, ROMDEC_IBUF, ROMDEC_IREADY),
-       INTC_GROUP(SDHI, SDHI3, SDHI0, SDHI1),
-       INTC_GROUP(SRC, SRC_OVF, SRC_ODFI, SRC_IDEI),
-#endif
 };
 
 static struct intc_prio_reg prio_registers[] __initdata = {