sh: intc - add support for x3

This patch converts the cpu specific interrupt setup code for x3 from
intc2 to intc. New vectors are also added to match the preliminary
information.

Use plat_irq_setup_pins() to select between IRQ and IRL mode for IRQ0-3.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/kernel/cpu/sh4a/setup-shx3.c b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
index 704c064f70dc90ad58f5f7ef25843845b5d9ca2c..7f3fa5167c6b4a5ba7dc53964ef6114b0e56babf 100644 (file)
--- a/arch/sh/kernel/cpu/sh4a/setup-shx3.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
@@ -58,28 +58,200 @@ static int __init shx3_devices_setup(void)
 }
 __initcall(shx3_devices_setup);
 
-static struct intc2_data intc2_irq_table[] = {
-       { 16, 0, 0, 0, 1, 2 },          /* TMU0 */
-       { 40, 4, 0, 0x20, 0, 3 },       /* SCIF0 ERI */
-       { 41, 4, 0, 0x20, 1, 3 },       /* SCIF0 RXI */
-       { 42, 4, 0, 0x20, 2, 3 },       /* SCIF0 BRI */
-       { 43, 4, 0, 0x20, 3, 3 },       /* SCIF0 TXI */
+enum {
+       UNUSED = 0,
+
+       /* interrupt sources */
+       IRL_LLLL, IRL_LLLH, IRL_LLHL, IRL_LLHH,
+       IRL_LHLL, IRL_LHLH, IRL_LHHL, IRL_LHHH,
+       IRL_HLLL, IRL_HLLH, IRL_HLHL, IRL_HLHH,
+       IRL_HHLL, IRL_HHLH, IRL_HHHL,
+       IRQ0, IRQ1, IRQ2, IRQ3,
+       HUDII,
+       TMU0, TMU1, TMU2, TMU3, TMU4, TMU5,
+       PCII0, PCII1, PCII2, PCII3, PCII4,
+       PCII5, PCII6, PCII7, PCII8, PCII9,
+       SCIF0_ERI, SCIF0_RXI, SCIF0_BRI, SCIF0_TXI,
+       SCIF1_ERI, SCIF1_RXI, SCIF1_BRI, SCIF1_TXI,
+       SCIF2_ERI, SCIF2_RXI, SCIF2_BRI, SCIF2_TXI,
+       SCIF3_ERI, SCIF3_RXI, SCIF3_BRI, SCIF3_TXI,
+       DMAC0_DMINT0, DMAC0_DMINT1, DMAC0_DMINT2, DMAC0_DMINT3,
+       DMAC0_DMINT4, DMAC0_DMINT5, DMAC0_DMAE,
+       DU,
+       DMAC1_DMINT6, DMAC1_DMINT7, DMAC1_DMINT8, DMAC1_DMINT9,
+       DMAC1_DMINT10, DMAC1_DMINT11, DMAC1_DMAE,
+       IIC, VIN0, VIN1, VCORE0, ATAPI,
+       DTU0_TEND, DTU0_AE, DTU0_TMISS,
+       DTU1_TEND, DTU1_AE, DTU1_TMISS,
+       DTU2_TEND, DTU2_AE, DTU2_TMISS,
+       DTU3_TEND, DTU3_AE, DTU3_TMISS,
+       FE0, FE1,
+       GPIO0, GPIO1, GPIO2, GPIO3,
+       PAM, IRM,
+
+       /* interrupt groups */
+       IRL, PCII56789, SCIF0, SCIF1, SCIF2, SCIF3,
+       DMAC0, DMAC1, DTU0, DTU1, DTU2, DTU3,
 };
 
-static struct intc2_desc intc2_irq_desc __read_mostly = {
-       .prio_base      = 0xfe410000,
-       .msk_base       = 0xfe410820,
-       .mskclr_base    = 0xfe410850,
+static struct intc_vect vectors[] = {
+       INTC_VECT(HUDII, 0x3e0),
+       INTC_VECT(TMU0, 0x400), INTC_VECT(TMU1, 0x420),
+       INTC_VECT(TMU2, 0x440), INTC_VECT(TMU3, 0x460),
+       INTC_VECT(TMU4, 0x480), INTC_VECT(TMU5, 0x4a0),
+       INTC_VECT(PCII0, 0x500), INTC_VECT(PCII1, 0x520),
+       INTC_VECT(PCII2, 0x540), INTC_VECT(PCII3, 0x560),
+       INTC_VECT(PCII4, 0x580), INTC_VECT(PCII5, 0x5a0),
+       INTC_VECT(PCII6, 0x5c0), INTC_VECT(PCII7, 0x5e0),
+       INTC_VECT(PCII8, 0x600), INTC_VECT(PCII9, 0x620),
+       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(SCIF2_ERI, 0x800), INTC_VECT(SCIF2_RXI, 0x820),
+       INTC_VECT(SCIF2_BRI, 0x840), INTC_VECT(SCIF2_TXI, 0x860),
+       INTC_VECT(SCIF3_ERI, 0x880), INTC_VECT(SCIF3_RXI, 0x8a0),
+       INTC_VECT(SCIF3_BRI, 0x8c0), INTC_VECT(SCIF3_TXI, 0x8e0),
+       INTC_VECT(DMAC0_DMINT0, 0x900), INTC_VECT(DMAC0_DMINT1, 0x920),
+       INTC_VECT(DMAC0_DMINT2, 0x940), INTC_VECT(DMAC0_DMINT3, 0x960),
+       INTC_VECT(DMAC0_DMINT4, 0x980), INTC_VECT(DMAC0_DMINT5, 0x9a0),
+       INTC_VECT(DMAC0_DMAE, 0x9c0),
+       INTC_VECT(DU, 0x9e0),
+       INTC_VECT(DMAC1_DMINT6, 0xa00), INTC_VECT(DMAC1_DMINT7, 0xa20),
+       INTC_VECT(DMAC1_DMINT8, 0xa40), INTC_VECT(DMAC1_DMINT9, 0xa60),
+       INTC_VECT(DMAC1_DMINT10, 0xa80), INTC_VECT(DMAC1_DMINT11, 0xaa0),
+       INTC_VECT(DMAC1_DMAE, 0xac0),
+       INTC_VECT(IIC, 0xae0),
+       INTC_VECT(VIN0, 0xb00), INTC_VECT(VIN1, 0xb20),
+       INTC_VECT(VCORE0, 0xb00), INTC_VECT(ATAPI, 0xb60),
+       INTC_VECT(DTU0_TEND, 0xc00), INTC_VECT(DTU0_AE, 0xc20),
+       INTC_VECT(DTU0_TMISS, 0xc40),
+       INTC_VECT(DTU1_TEND, 0xc60), INTC_VECT(DTU1_AE, 0xc80),
+       INTC_VECT(DTU1_TMISS, 0xca0),
+       INTC_VECT(DTU2_TEND, 0xcc0), INTC_VECT(DTU2_AE, 0xce0),
+       INTC_VECT(DTU2_TMISS, 0xd00),
+       INTC_VECT(DTU3_TEND, 0xd20), INTC_VECT(DTU3_AE, 0xd40),
+       INTC_VECT(DTU3_TMISS, 0xd60),
+       INTC_VECT(FE0, 0xe00), INTC_VECT(FE1, 0xe20),
+       INTC_VECT(GPIO0, 0xe40), INTC_VECT(GPIO1, 0xe60),
+       INTC_VECT(GPIO2, 0xe80), INTC_VECT(GPIO3, 0xea0),
+       INTC_VECT(PAM, 0xec0), INTC_VECT(IRM, 0xee0),
+};
 
-       .intc2_data     = intc2_irq_table,
-       .nr_irqs        = ARRAY_SIZE(intc2_irq_table),
+static struct intc_group groups[] = {
+       INTC_GROUP(IRL, IRL_LLLL, IRL_LLLH, IRL_LLHL, IRL_LLHH,
+                  IRL_LHLL, IRL_LHLH, IRL_LHHL, IRL_LHHH,
+                  IRL_HLLL, IRL_HLLH, IRL_HLHL, IRL_HLHH,
+                  IRL_HHLL, IRL_HHLH, IRL_HHHL),
+       INTC_GROUP(PCII56789, PCII5, PCII6, PCII7, PCII8, PCII9),
+       INTC_GROUP(SCIF0, SCIF0_ERI, SCIF0_RXI, SCIF0_BRI, SCIF0_TXI),
+       INTC_GROUP(SCIF1, SCIF1_ERI, SCIF1_RXI, SCIF1_BRI, SCIF1_TXI),
+       INTC_GROUP(SCIF2, SCIF2_ERI, SCIF2_RXI, SCIF2_BRI, SCIF2_TXI),
+       INTC_GROUP(SCIF3, SCIF3_ERI, SCIF3_RXI, SCIF3_BRI, SCIF3_TXI),
+       INTC_GROUP(DMAC0, DMAC0_DMINT0, DMAC0_DMINT1, DMAC0_DMINT2,
+                  DMAC0_DMINT3, DMAC0_DMINT4, DMAC0_DMINT5, DMAC0_DMAE),
+       INTC_GROUP(DMAC1, DMAC1_DMINT6, DMAC1_DMINT7, DMAC1_DMINT8,
+                  DMAC1_DMINT9, DMAC1_DMINT10, DMAC1_DMINT11),
+       INTC_GROUP(DTU0, DTU0_TEND, DTU0_AE, DTU0_TMISS),
+       INTC_GROUP(DTU1, DTU1_TEND, DTU1_AE, DTU1_TMISS),
+       INTC_GROUP(DTU2, DTU2_TEND, DTU2_AE, DTU2_TMISS),
+       INTC_GROUP(DTU3, DTU3_TEND, DTU3_AE, DTU3_TMISS),
+};
 
-       .chip = {
-               .name   = "INTC2-SHX3",
-       },
+static struct intc_prio priorities[] = {
+       INTC_PRIO(SCIF0, 3),
+       INTC_PRIO(SCIF1, 3),
+       INTC_PRIO(SCIF2, 3),
+       INTC_PRIO(SCIF3, 3),
+};
+
+static struct intc_mask_reg mask_registers[] = {
+       { 0xfe410030, 0xfe410050, 32, /* CnINTMSK0 / CnINTMSKCLR0 */
+         { IRQ0, IRQ1, IRQ2, IRQ3 } },
+       { 0xfe410040, 0xfe410060, 32, /* CnINTMSK1 / CnINTMSKCLR1 */
+         { IRL } },
+       { 0xfe410820, 0xfe410850, 32, /* CnINT2MSK0 / CnINT2MSKCLR0 */
+         { FE1, FE0, 0, ATAPI, VCORE0, VIN1, VIN0, IIC,
+           DU, GPIO3, GPIO2, GPIO1, GPIO0, PAM, 0, 0,
+           0, 0, 0, 0, 0, 0, 0, 0, /* HUDI bits ignored */
+           0, TMU5, TMU4, TMU3, TMU2, TMU1, TMU0, 0, } },
+       { 0xfe410830, 0xfe410860, 32, /* CnINT2MSK1 / CnINT2MSKCLR1 */
+         { 0, 0, 0, 0, DTU3, DTU2, DTU1, DTU0, /* IRM bits ignored */
+           PCII9, PCII8, PCII7, PCII6, PCII5, PCII4, PCII3, PCII2,
+           PCII1, PCII0, DMAC1_DMAE, DMAC1_DMINT11,
+           DMAC1_DMINT10, DMAC1_DMINT9, DMAC1_DMINT8, DMAC1_DMINT7,
+           DMAC1_DMINT6, DMAC0_DMAE, DMAC0_DMINT5, DMAC0_DMINT4,
+           DMAC0_DMINT3, DMAC0_DMINT2, DMAC0_DMINT1, DMAC0_DMINT0 } },
+       { 0xfe410840, 0xfe410870, 32, /* CnINT2MSK2 / CnINT2MSKCLR2 */
+         { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+           SCIF3_TXI, SCIF3_BRI, SCIF3_RXI, SCIF3_ERI,
+           SCIF2_TXI, SCIF2_BRI, SCIF2_RXI, SCIF2_ERI,
+           SCIF1_TXI, SCIF1_BRI, SCIF1_RXI, SCIF1_ERI,
+           SCIF0_TXI, SCIF0_BRI, SCIF0_RXI, SCIF0_ERI } },
+};
+
+static struct intc_prio_reg prio_registers[] = {
+       { 0xfe410010, 32, 4, /* INTPRI */ { IRQ0, IRQ1, IRQ2, IRQ3 } },
+
+       { 0xfe410800, 32, 4, /* INT2PRI0 */ { 0, HUDII, TMU5, TMU4,
+                                             TMU3, TMU2, TMU1, TMU0 } },
+       { 0xfe410804, 32, 4, /* INT2PRI1 */ { DTU3, DTU2, DTU1, DTU0,
+                                             SCIF3, SCIF2, SCIF1, SCIF0 } },
+       { 0xfe410808, 32, 4, /* INT2PRI2 */ { DMAC1, DMAC0, PCII56789, PCII4,
+                                             PCII3, PCII2, PCII1, PCII0 } },
+       { 0xfe41080c, 32, 4, /* INT2PRI3 */ { FE1, FE0, ATAPI, VCORE0,
+                                             VIN1, VIN0, IIC, DU} },
+       { 0xfe410810, 32, 4, /* INT2PRI4 */ { 0, 0, PAM, GPIO3,
+                                             GPIO2, GPIO1, GPIO0, IRM } },
 };
 
+static DECLARE_INTC_DESC(intc_desc, "shx3", vectors, groups, priorities,
+                        mask_registers, prio_registers, NULL);
+
+/* Support for external interrupt pins in IRQ mode */
+static struct intc_vect vectors_irq[] = {
+       INTC_VECT(IRQ0, 0x240), INTC_VECT(IRQ1, 0x280),
+       INTC_VECT(IRQ2, 0x2c0), INTC_VECT(IRQ3, 0x300),
+};
+
+static struct intc_sense_reg sense_registers[] = {
+       { 0xfe41001c, 32, 2, /* ICR1 */   { IRQ0, IRQ1, IRQ2, IRQ3 } },
+};
+
+static DECLARE_INTC_DESC(intc_desc_irq, "shx3-irq", vectors_irq, groups,
+                        priorities, mask_registers, prio_registers,
+                        sense_registers);
+
+/* External interrupt pins in IRL mode */
+static struct intc_vect vectors_irl[] = {
+       INTC_VECT(IRL_LLLL, 0x200), INTC_VECT(IRL_LLLH, 0x220),
+       INTC_VECT(IRL_LLHL, 0x240), INTC_VECT(IRL_LLHH, 0x260),
+       INTC_VECT(IRL_LHLL, 0x280), INTC_VECT(IRL_LHLH, 0x2a0),
+       INTC_VECT(IRL_LHHL, 0x2c0), INTC_VECT(IRL_LHHH, 0x2e0),
+       INTC_VECT(IRL_HLLL, 0x300), INTC_VECT(IRL_HLLH, 0x320),
+       INTC_VECT(IRL_HLHL, 0x340), INTC_VECT(IRL_HLHH, 0x360),
+       INTC_VECT(IRL_HHLL, 0x380), INTC_VECT(IRL_HHLH, 0x3a0),
+       INTC_VECT(IRL_HHHL, 0x3c0),
+};
+
+static DECLARE_INTC_DESC(intc_desc_irl, "shx3-irl", vectors_irl, groups,
+                        priorities, mask_registers, prio_registers, NULL);
+
+void __init plat_irq_setup_pins(int mode)
+{
+       switch (mode) {
+       case IRQ_MODE_IRQ:
+               register_intc_controller(&intc_desc_irq);
+               break;
+       case IRQ_MODE_IRL3210:
+               register_intc_controller(&intc_desc_irl);
+               break;
+       default:
+               BUG();
+       }
+}
+
 void __init plat_irq_setup(void)
 {
-       register_intc2_controller(&intc2_irq_desc);
+       register_intc_controller(&intc_desc);
 }

diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index c35ba72a40021d0690854a6e94abd43d41d7338f..d1a7e3f7b4ae2a55fd3a77edd49d4462a2abc4ee 100644 (file)
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -197,7 +197,7 @@ config CPU_SUBTYPE_SHX3
        bool "Support SH-X3 processor"
        select CPU_SH4A
        select CPU_SHX3
-       select CPU_HAS_INTC2_IRQ
+       select CPU_HAS_INTC_IRQ
 
 # SH4AL-DSP Processor Support