sh: Convert INTC2 to IRQ table registration.

Currently the INTC2 code contains a fixed IRQ table that it
iterates through to set the handler type, we move this in to
the CPU subtype setup code instead and allow for submitting
the table that way.

This drops the ST40 tables, as nothing has been happening
with those processors, while converting the only existing
users to use the new table directly (SH7760 and SH7780).

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

2 files changed, 90 insertions, 0 deletions

diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7760.c b/arch/sh/kernel/cpu/sh4/setup-sh7760.c
index 97f1c9af35d6..07e5377bf550 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh7760.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7760.c
@@ -51,3 +51,66 @@ static int __init sh7760_devices_setup(void)
                                     ARRAY_SIZE(sh7760_devices));
 }
 __initcall(sh7760_devices_setup);
+
+/*
+ * SH7760 INTC2-Style interrupts, vectors IRQ48-111 INTEVT 0x800-0xFE0
+ */
+static struct intc2_data intc2_irq_table[] = {
+        /* INTPRIO0 | INTMSK0 */
+        {48,  0, 28, 0, 31,  3},        /* IRQ 4 */
+        {49,  0, 24, 0, 30,  3},        /* IRQ 3 */
+        {50,  0, 20, 0, 29,  3},        /* IRQ 2 */
+        {51,  0, 16, 0, 28,  3},        /* IRQ 1 */
+        /* 52-55 (INTEVT 0x880-0x8E0) unused/reserved */
+        /* INTPRIO4 | INTMSK0 */
+        {56,  4, 28, 0, 25,  3},        /* HCAN2_CHAN0 */
+        {57,  4, 24, 0, 24,  3},        /* HCAN2_CHAN1 */
+        {58,  4, 20, 0, 23,  3},        /* I2S_CHAN0   */
+        {59,  4, 16, 0, 22,  3},        /* I2S_CHAN1   */
+        {60,  4, 12, 0, 21,  3},        /* AC97_CHAN0  */
+        {61,  4,  8, 0, 20,  3},        /* AC97_CHAN1  */
+        {62,  4,  4, 0, 19,  3},        /* I2C_CHAN0   */
+        {63,  4,  0, 0, 18,  3},        /* I2C_CHAN1   */
+        /* INTPRIO8 | INTMSK0 */
+        {52,  8, 16, 0, 11,  3},        /* SCIF0_ERI_IRQ */
+        {53,  8, 16, 0, 10,  3},        /* SCIF0_RXI_IRQ */
+        {54,  8, 16, 0,  9,  3},        /* SCIF0_BRI_IRQ */
+        {55,  8, 16, 0,  8,  3},        /* SCIF0_TXI_IRQ */
+        {64,  8, 28, 0, 17,  3},        /* USBHI_IRQ */
+        {65,  8, 24, 0, 16,  3},        /* LCDC      */
+        /* 66, 67 unused */
+        {68,  8, 20, 0, 14, 13},        /* DMABRGI0_IRQ */
+        {69,  8, 20, 0, 13, 13},        /* DMABRGI1_IRQ */
+        {70,  8, 20, 0, 12, 13},        /* DMABRGI2_IRQ */
+        /* 71 unused */
+        {72,  8, 12, 0,  7,  3},        /* SCIF1_ERI_IRQ */
+        {73,  8, 12, 0,  6,  3},        /* SCIF1_RXI_IRQ */
+        {74,  8, 12, 0,  5,  3},        /* SCIF1_BRI_IRQ */
+        {75,  8, 12, 0,  4,  3},        /* SCIF1_TXI_IRQ */
+        {76,  8,  8, 0,  3,  3},        /* SCIF2_ERI_IRQ */
+        {77,  8,  8, 0,  2,  3},        /* SCIF2_RXI_IRQ */
+        {78,  8,  8, 0,  1,  3},        /* SCIF2_BRI_IRQ */
+        {79,  8,  8, 0,  0,  3},        /* SCIF2_TXI_IRQ */
+        /*          | INTMSK4 */
+        {80,  8,  4, 4, 23,  3},        /* SIM_ERI */
+        {81,  8,  4, 4, 22,  3},        /* SIM_RXI */
+        {82,  8,  4, 4, 21,  3},        /* SIM_TXI */
+        {83,  8,  4, 4, 20,  3},        /* SIM_TEI */
+        {84,  8,  0, 4, 19,  3},        /* HSPII */
+        /* INTPRIOC | INTMSK4 */
+        /* 85-87 unused/reserved */
+        {88, 12, 20, 4, 18,  3},        /* MMCI0 */
+        {89, 12, 20, 4, 17,  3},        /* MMCI1 */
+        {90, 12, 20, 4, 16,  3},        /* MMCI2 */
+        {91, 12, 20, 4, 15,  3},        /* MMCI3 */
+        {92, 12, 12, 4,  6,  3},        /* MFI (unsure, bug? in my 7760 manual*/
+        /* 93-107 reserved/undocumented */
+        {108,12,  4, 4,  1,  3},        /* ADC  */
+        {109,12,  0, 4,  0,  3},        /* CMTI */
+        /* 110-111 reserved/unused */
+};
+
+void __init init_IRQ_intc2(void)
+{
+        make_intc2_irq(intc2_irq_table, ARRAY_SIZE(intc2_irq_table));
+}
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7780.c b/arch/sh/kernel/cpu/sh4/setup-sh7780.c
index 72493f259edc..814ddb226531 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh7780.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7780.c
@@ -77,3 +77,30 @@ static int __init sh7780_devices_setup(void)
                                     ARRAY_SIZE(sh7780_devices));
 }
 __initcall(sh7780_devices_setup);
+
+static struct intc2_data intc2_irq_table[] = {
+        { TIMER_IRQ, 0, 24, 0, INTC_TMU0_MSK, 2 },
+        { 21, 1, 0, 0, INTC_RTC_MSK, TIMER_PRIORITY },
+        { 22, 1, 1, 0, INTC_RTC_MSK, TIMER_PRIORITY },
+        { 23, 1, 2, 0, INTC_RTC_MSK, TIMER_PRIORITY },
+        { SCIF0_ERI_IRQ, 8, 24, 0, INTC_SCIF0_MSK, SCIF0_PRIORITY },
+        { SCIF0_RXI_IRQ, 8, 24, 0, INTC_SCIF0_MSK, SCIF0_PRIORITY },
+        { SCIF0_BRI_IRQ, 8, 24, 0, INTC_SCIF0_MSK, SCIF0_PRIORITY },
+        { SCIF0_TXI_IRQ, 8, 24, 0, INTC_SCIF0_MSK, SCIF0_PRIORITY },
+
+        { SCIF1_ERI_IRQ, 8, 16, 0, INTC_SCIF1_MSK, SCIF1_PRIORITY },
+        { SCIF1_RXI_IRQ, 8, 16, 0, INTC_SCIF1_MSK, SCIF1_PRIORITY },
+        { SCIF1_BRI_IRQ, 8, 16, 0, INTC_SCIF1_MSK, SCIF1_PRIORITY },
+        { SCIF1_TXI_IRQ, 8, 16, 0, INTC_SCIF1_MSK, SCIF1_PRIORITY },
+
+        { PCIC0_IRQ, 0x10,  8, 0, INTC_PCIC0_MSK, PCIC0_PRIORITY },
+        { PCIC1_IRQ, 0x10,  0, 0, INTC_PCIC1_MSK, PCIC1_PRIORITY },
+        { PCIC2_IRQ, 0x14, 24, 0, INTC_PCIC2_MSK, PCIC2_PRIORITY },
+        { PCIC3_IRQ, 0x14, 16, 0, INTC_PCIC3_MSK, PCIC3_PRIORITY },
+        { PCIC4_IRQ, 0x14,  8, 0, INTC_PCIC4_MSK, PCIC4_PRIORITY },
+};
+
+void __init init_IRQ_intc2(void)
+{
+        make_intc2_irq(intc2_irq_table, ARRAY_SIZE(intc2_irq_table));
+}