sh: rework intc2 code

The shared intc2 code currently contains cpu-specific #ifdefs.
This is a tad unclean and it prevents us from using the shared code
to drive board-specific irqs on the se7780 board.

This patch reworks the intc2 code by moving the base addresses of
the intc2 registers into struct intc2_desc. This new structure also
contains the name of the controller in struct irq_chip. The idea
behind putting struct irq_chip in there is that we can use offsetof()
to locate the base addresses in the irq_chip callbacks.

One logic change has been made - the original shared intc2 code
enabled the interrupts by default but with this patch they are all
disabled by default.

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

2 files changed, 29 insertions, 2 deletions

diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
index 9aeaa2ddaa28..b57c760bffde 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
@@ -102,7 +102,20 @@ static struct intc2_data intc2_irq_table[] = {
         { 68, 0x14,  8, 0, 18, 2 },     /* PCIC4 */
 };
 
+static struct intc2_desc intc2_irq_desc __read_mostly = {
+        .prio_base      = 0xffd40000,
+        .msk_base       = 0xffd40038,
+        .mskclr_base    = 0xffd4003c,
+
+        .intc2_data     = intc2_irq_table,
+        .nr_irqs        = ARRAY_SIZE(intc2_irq_table),
+
+        .chip = {
+                .name   = "INTC2-sh7780",
+        },
+};
+
 void __init init_IRQ_intc2(void)
 {
-        make_intc2_irq(intc2_irq_table, ARRAY_SIZE(intc2_irq_table));
+        register_intc2_controller(&intc2_irq_desc);
 }
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
index 07b0de82cfe6..ce10ec5d6914 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
@@ -97,7 +97,21 @@ static struct intc2_data intc2_irq_table[] = {
         { 60, 12, 16, 0, 7, 3 },        /* SCIF5 ERI, RXI, BRI, TXI */
 };
 
+static struct intc2_desc intc2_irq_desc __read_mostly = {
+        .prio_base      = 0xffd40000,
+        .msk_base       = 0xffd40038,
+        .mskclr_base    = 0xffd4003c,
+
+        .intc2_data     = intc2_irq_table,
+        .nr_irqs        = ARRAY_SIZE(intc2_irq_table),
+
+        .chip = {
+                .name   = "INTC2-sh7785",
+        },
+};
+
 void __init init_IRQ_intc2(void)
 {
-        make_intc2_irq(intc2_irq_table, ARRAY_SIZE(intc2_irq_table));
+        register_intc2_controller(&intc2_irq_desc);
 }
+