sh: rework ipr code

This patch reworks the ipr code by grouping the offset array together
with the ipr_data structure in a new data structure called ipr_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. This strategy has much in common with the recently merged
intc2 code.

One logic change has been made - the original ipr 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>

1 files changed, 23 insertions, 7 deletions

diff --git a/arch/sh/boards/shmin/setup.c b/arch/sh/boards/shmin/setup.c
index 9c8bb51eb4bb..dfd124509f42 100644
--- a/arch/sh/boards/shmin/setup.c
+++ b/arch/sh/boards/shmin/setup.c
@@ -6,28 +6,44 @@
  * SHMIN Support.
  */
 #include <linux/init.h>
+#include <linux/irq.h>
 #include <asm/machvec.h>
 #include <asm/shmin.h>
 #include <asm/clock.h>
-#include <asm/irq.h>
 #include <asm/io.h>
 
 #define PFC_PHCR        0xa400010eUL
 #define INTC_ICR1       0xa4000010UL
 #define INTC_IPRC       0xa4000016UL
 
-static struct ipr_data shmin_ipr_map[] = {
-        { .irq=32, .addr=INTC_IPRC, .shift= 0, .priority=0 },
-        { .irq=33, .addr=INTC_IPRC, .shift= 4, .priority=0 },
-        { .irq=34, .addr=INTC_IPRC, .shift= 8, .priority=8 },
-        { .irq=35, .addr=INTC_IPRC, .shift=12, .priority=0 },
+static struct ipr_data ipr_irq_table[] = {
+        { 32, 0, 0, 0 },
+        { 33, 0, 4, 0 },
+        { 34, 0, 8, 8 },
+        { 35, 0, 12, 0 },
+};
+
+static unsigned long ipr_offsets[] = {
+        INTC_IPRC,
+};
+
+static struct ipr_desc ipr_irq_desc = {
+        .ipr_offsets    = ipr_offsets,
+        .nr_offsets     = ARRAY_SIZE(ipr_offsets),
+
+        .ipr_data       = ipr_irq_table,
+        .nr_irqs        = ARRAY_SIZE(ipr_irq_table),
+
+        .chip = {
+                .name   = "IPR-shmin",
+        },
 };
 
 static void __init init_shmin_irq(void)
 {
         ctrl_outw(0x2a00, PFC_PHCR);    // IRQ0-3=IRQ
         ctrl_outw(0x0aaa, INTC_ICR1);   // IRQ0-3=IRQ-mode,Low-active.
-        make_ipr_irq(shmin_ipr_map, ARRAY_SIZE(shmin_ipr_map));
+        register_ipr_controller(&ipr_irq_desc);
 }
 
 static void __iomem *shmin_ioport_map(unsigned long port, unsigned int size)