sh: multiple vectors per irq - sh7785

Update intc tables and platform data to use one linux irq
per maskable interrupt source instead of keeping the one-to-one
mapping between vectors and linux irqs.

This fixes potential irq masking issues for sh7785 hardware
blocks such as SCIF/DMAC/PCIC5/MMCIF/GDTA/FLCTL/GPIO

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Tested-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
index 30baa63..d80802a 100644 (file)
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
@@ -20,18 +20,13 @@ static struct plat_sci_port sci_platform_data[] = {
                .mapbase        = 0xffea0000,
                .flags          = UPF_BOOT_AUTOCONF,
                .type           = PORT_SCIF,
-               .irqs           = { 40, 41, 43, 42 },
+               .irqs           = { 40, 40, 40, 40 },
        }, {
                .mapbase        = 0xffeb0000,
                .flags          = UPF_BOOT_AUTOCONF,
                .type           = PORT_SCIF,
-               .irqs           = { 44, 45, 47, 46 },
-       },
-
-       /*
-        * The rest of these all have multiplexed IRQs
-        */
-       {
+               .irqs           = { 44, 44, 44, 44 },
+       }, {
                .mapbase        = 0xffec0000,
                .flags          = UPF_BOOT_AUTOCONF,
                .type           = PORT_SCIF,
@@ -91,33 +86,19 @@ enum {
        IRL4_HHLL, IRL4_HHLH, IRL4_HHHL,
 
        IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7,
-       WDT,
-       TMU0, TMU1, TMU2, TMU2_TICPI,
-       HUDI,
-       DMAC0_DMINT0, DMAC0_DMINT1, DMAC0_DMINT2, DMAC0_DMINT3,
-       DMAC0_DMINT4, DMAC0_DMINT5, DMAC0_DMAE,
-       SCIF0_ERI, SCIF0_RXI, SCIF0_BRI, SCIF0_TXI,
-       SCIF1_ERI, SCIF1_RXI, SCIF1_BRI, SCIF1_TXI,
-       DMAC1_DMINT6, DMAC1_DMINT7, DMAC1_DMINT8, DMAC1_DMINT9,
-       DMAC1_DMINT10, DMAC1_DMINT11, DMAC1_DMAE,
-       HSPI,
+       WDT, TMU0, TMU1, TMU2, TMU2_TICPI,
+       HUDI, DMAC0, SCIF0, SCIF1, DMAC1, HSPI,
        SCIF2, SCIF3, SCIF4, SCIF5,
-       PCISERR, PCIINTA, PCIINTB, PCIINTC, PCIINTD,
-       PCIERR, PCIPWD3, PCIPWD2, PCIPWD1, PCIPWD0,
-       SIOF,
-       MMCIF_FSTAT, MMCIF_TRAN, MMCIF_ERR, MMCIF_FRDY,
-       DU,
-       GDTA_GACLI, GDTA_GAMCI, GDTA_GAERI,
+       PCISERR, PCIINTA, PCIINTB, PCIINTC, PCIINTD, PCIC5,
+       SIOF, MMCIF, DU, GDTA,
        TMU3, TMU4, TMU5,
        SSI0, SSI1,
        HAC0, HAC1,
-       FLCTL_FLSTE, FLCTL_FLEND, FLCTL_FLTRQ0, FLCTL_FLTRQ1,
-       GPIOI0, GPIOI1, GPIOI2, GPIOI3,
+       FLCTL, GPIO,
 
        /* interrupt groups */
 
-       TMU012, DMAC0, SCIF0, SCIF1, DMAC1,
-       PCIC5, MMCIF, GDTA, TMU345, FLCTL, GPIO
+       TMU012, TMU345
 };
 
 static struct intc_vect vectors[] __initdata = {
@@ -125,57 +106,45 @@ static struct intc_vect vectors[] __initdata = {
        INTC_VECT(TMU0, 0x580), INTC_VECT(TMU1, 0x5a0),
        INTC_VECT(TMU2, 0x5c0), INTC_VECT(TMU2_TICPI, 0x5e0),
        INTC_VECT(HUDI, 0x600),
-       INTC_VECT(DMAC0_DMINT0, 0x620), INTC_VECT(DMAC0_DMINT1, 0x640),
-       INTC_VECT(DMAC0_DMINT2, 0x660), INTC_VECT(DMAC0_DMINT3, 0x680),
-       INTC_VECT(DMAC0_DMINT4, 0x6a0), INTC_VECT(DMAC0_DMINT5, 0x6c0),
-       INTC_VECT(DMAC0_DMAE, 0x6e0),
-       INTC_VECT(SCIF0_ERI, 0x700), INTC_VECT(SCIF0_RXI, 0x720),
-       INTC_VECT(SCIF0_BRI, 0x740), INTC_VECT(SCIF0_TXI, 0x760),
-       INTC_VECT(SCIF1_ERI, 0x780), INTC_VECT(SCIF1_RXI, 0x7a0),
-       INTC_VECT(SCIF1_BRI, 0x7c0), INTC_VECT(SCIF1_TXI, 0x7e0),
-       INTC_VECT(DMAC1_DMINT6, 0x880), INTC_VECT(DMAC1_DMINT7, 0x8a0),
-       INTC_VECT(DMAC1_DMINT8, 0x8c0), INTC_VECT(DMAC1_DMINT9, 0x8e0),
-       INTC_VECT(DMAC1_DMINT10, 0x900), INTC_VECT(DMAC1_DMINT11, 0x920),
-       INTC_VECT(DMAC1_DMAE, 0x940),
+       INTC_VECT(DMAC0, 0x620), INTC_VECT(DMAC0, 0x640),
+       INTC_VECT(DMAC0, 0x660), INTC_VECT(DMAC0, 0x680),
+       INTC_VECT(DMAC0, 0x6a0), INTC_VECT(DMAC0, 0x6c0),
+       INTC_VECT(DMAC0, 0x6e0),
+       INTC_VECT(SCIF0, 0x700), INTC_VECT(SCIF0, 0x720),
+       INTC_VECT(SCIF0, 0x740), INTC_VECT(SCIF0, 0x760),
+       INTC_VECT(SCIF1, 0x780), INTC_VECT(SCIF1, 0x7a0),
+       INTC_VECT(SCIF1, 0x7c0), INTC_VECT(SCIF1, 0x7e0),
+       INTC_VECT(DMAC1, 0x880), INTC_VECT(DMAC1, 0x8a0),
+       INTC_VECT(DMAC1, 0x8c0), INTC_VECT(DMAC1, 0x8e0),
+       INTC_VECT(DMAC1, 0x900), INTC_VECT(DMAC1, 0x920),
+       INTC_VECT(DMAC1, 0x940),
        INTC_VECT(HSPI, 0x960),
        INTC_VECT(SCIF2, 0x980), INTC_VECT(SCIF3, 0x9a0),
        INTC_VECT(SCIF4, 0x9c0), INTC_VECT(SCIF5, 0x9e0),
        INTC_VECT(PCISERR, 0xa00), INTC_VECT(PCIINTA, 0xa20),
        INTC_VECT(PCIINTB, 0xa40), INTC_VECT(PCIINTC, 0xa60),
-       INTC_VECT(PCIINTD, 0xa80), INTC_VECT(PCIERR, 0xaa0),
-       INTC_VECT(PCIPWD3, 0xac0), INTC_VECT(PCIPWD2, 0xae0),
-       INTC_VECT(PCIPWD1, 0xb00), INTC_VECT(PCIPWD0, 0xb20),
+       INTC_VECT(PCIINTD, 0xa80), INTC_VECT(PCIC5, 0xaa0),
+       INTC_VECT(PCIC5, 0xac0), INTC_VECT(PCIC5, 0xae0),
+       INTC_VECT(PCIC5, 0xb00), INTC_VECT(PCIC5, 0xb20),
        INTC_VECT(SIOF, 0xc00),
-       INTC_VECT(MMCIF_FSTAT, 0xd00), INTC_VECT(MMCIF_TRAN, 0xd20),
-       INTC_VECT(MMCIF_ERR, 0xd40), INTC_VECT(MMCIF_FRDY, 0xd60),
+       INTC_VECT(MMCIF, 0xd00), INTC_VECT(MMCIF, 0xd20),
+       INTC_VECT(MMCIF, 0xd40), INTC_VECT(MMCIF, 0xd60),
        INTC_VECT(DU, 0xd80),
-       INTC_VECT(GDTA_GACLI, 0xda0), INTC_VECT(GDTA_GAMCI, 0xdc0),
-       INTC_VECT(GDTA_GAERI, 0xde0),
+       INTC_VECT(GDTA, 0xda0), INTC_VECT(GDTA, 0xdc0),
+       INTC_VECT(GDTA, 0xde0),
        INTC_VECT(TMU3, 0xe00), INTC_VECT(TMU4, 0xe20),
        INTC_VECT(TMU5, 0xe40),
        INTC_VECT(SSI0, 0xe80), INTC_VECT(SSI1, 0xea0),
        INTC_VECT(HAC0, 0xec0), INTC_VECT(HAC1, 0xee0),
-       INTC_VECT(FLCTL_FLSTE, 0xf00), INTC_VECT(FLCTL_FLEND, 0xf20),
-       INTC_VECT(FLCTL_FLTRQ0, 0xf40), INTC_VECT(FLCTL_FLTRQ1, 0xf60),
-       INTC_VECT(GPIOI0, 0xf80), INTC_VECT(GPIOI1, 0xfa0),
-       INTC_VECT(GPIOI2, 0xfc0), INTC_VECT(GPIOI3, 0xfe0),
+       INTC_VECT(FLCTL, 0xf00), INTC_VECT(FLCTL, 0xf20),
+       INTC_VECT(FLCTL, 0xf40), INTC_VECT(FLCTL, 0xf60),
+       INTC_VECT(GPIO, 0xf80), INTC_VECT(GPIO, 0xfa0),
+       INTC_VECT(GPIO, 0xfc0), INTC_VECT(GPIO, 0xfe0),
 };
 
 static struct intc_group groups[] __initdata = {
        INTC_GROUP(TMU012, TMU0, TMU1, TMU2, TMU2_TICPI),
-       INTC_GROUP(DMAC0, DMAC0_DMINT0, DMAC0_DMINT1, DMAC0_DMINT2,
-                  DMAC0_DMINT3, DMAC0_DMINT4, DMAC0_DMINT5, DMAC0_DMAE),
-       INTC_GROUP(SCIF0, SCIF0_ERI, SCIF0_RXI, SCIF0_BRI, SCIF0_TXI),
-       INTC_GROUP(SCIF1, SCIF1_ERI, SCIF1_RXI, SCIF1_BRI, SCIF1_TXI),
-       INTC_GROUP(DMAC1, DMAC1_DMINT6, DMAC1_DMINT7, DMAC1_DMINT8,
-                  DMAC1_DMINT9, DMAC1_DMINT10, DMAC1_DMINT11, DMAC1_DMAE),
-       INTC_GROUP(PCIC5, PCIERR, PCIPWD3, PCIPWD2, PCIPWD1, PCIPWD0),
-       INTC_GROUP(MMCIF, MMCIF_FSTAT, MMCIF_TRAN, MMCIF_ERR, MMCIF_FRDY),
-       INTC_GROUP(GDTA, GDTA_GACLI, GDTA_GAMCI, GDTA_GAERI),
        INTC_GROUP(TMU345, TMU3, TMU4, TMU5),
-       INTC_GROUP(FLCTL, FLCTL_FLSTE, FLCTL_FLEND,
-                  FLCTL_FLTRQ0, FLCTL_FLTRQ1),
-       INTC_GROUP(GPIO, GPIOI0, GPIOI1, GPIOI2, GPIOI3),
 };
 
 static struct intc_mask_reg mask_registers[] __initdata = {