1 files changed, 26 insertions, 24 deletions

diff --git a/drivers/irqchip/irq-sirfsoc.c b/drivers/irqchip/irq-sirfsoc.c
index a469355df352..10cb21b9ba3d 100644
--- a/drivers/irqchip/irq-sirfsoc.c
+++ b/drivers/irqchip/irq-sirfsoc.c
@@ -11,40 +11,44 @@
 #include <linux/irq.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
+#include <linux/irqchip.h>
 #include <linux/irqdomain.h>
 #include <linux/syscore_ops.h>
 #include <asm/mach/irq.h>
 #include <asm/exception.h>
-#include "irqchip.h"
 
-#define SIRFSOC_INT_RISC_MASK0          0x0018
-#define SIRFSOC_INT_RISC_MASK1          0x001C
-#define SIRFSOC_INT_RISC_LEVEL0         0x0020
-#define SIRFSOC_INT_RISC_LEVEL1         0x0024
+#define SIRFSOC_INT_RISC_MASK0          0x0018
+#define SIRFSOC_INT_RISC_MASK1          0x001C
+#define SIRFSOC_INT_RISC_LEVEL0         0x0020
+#define SIRFSOC_INT_RISC_LEVEL1         0x0024
 #define SIRFSOC_INIT_IRQ_ID             0x0038
+#define SIRFSOC_INT_BASE_OFFSET         0x0004
 
 #define SIRFSOC_NUM_IRQS                64
+#define SIRFSOC_NUM_BANKS               (SIRFSOC_NUM_IRQS / 32)
 
 static struct irq_domain *sirfsoc_irqdomain;
 
-static __init void
-sirfsoc_alloc_gc(void __iomem *base, unsigned int irq_start, unsigned int num)
+static __init void sirfsoc_alloc_gc(void __iomem *base)
 {
-        struct irq_chip_generic *gc;
-        struct irq_chip_type *ct;
-        int ret;
         unsigned int clr = IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN;
         unsigned int set = IRQ_LEVEL;
-
-        ret = irq_alloc_domain_generic_chips(sirfsoc_irqdomain, num, 1, "irq_sirfsoc",
-                handle_level_irq, clr, set, IRQ_GC_INIT_MASK_CACHE);
-
-        gc = irq_get_domain_generic_chip(sirfsoc_irqdomain, irq_start);
-        gc->reg_base = base;
-        ct = gc->chip_types;
-        ct->chip.irq_mask = irq_gc_mask_clr_bit;
-        ct->chip.irq_unmask = irq_gc_mask_set_bit;
-        ct->regs.mask = SIRFSOC_INT_RISC_MASK0;
+        struct irq_chip_generic *gc;
+        struct irq_chip_type *ct;
+        int i;
+
+        irq_alloc_domain_generic_chips(sirfsoc_irqdomain, 32, 1, "irq_sirfsoc",
+                                       handle_level_irq, clr, set,
+                                       IRQ_GC_INIT_MASK_CACHE);
+
+        for (i = 0; i < SIRFSOC_NUM_BANKS; i++) {
+                gc = irq_get_domain_generic_chip(sirfsoc_irqdomain, i * 32);
+                gc->reg_base = base + i * SIRFSOC_INT_BASE_OFFSET;
+                ct = gc->chip_types;
+                ct->chip.irq_mask = irq_gc_mask_clr_bit;
+                ct->chip.irq_unmask = irq_gc_mask_set_bit;
+                ct->regs.mask = SIRFSOC_INT_RISC_MASK0;
+        }
 }
 
 static void __exception_irq_entry sirfsoc_handle_irq(struct pt_regs *regs)
@@ -64,10 +68,8 @@ static int __init sirfsoc_irq_init(struct device_node *np,
                 panic("unable to map intc cpu registers\n");
 
         sirfsoc_irqdomain = irq_domain_add_linear(np, SIRFSOC_NUM_IRQS,
-                &irq_generic_chip_ops, base);
-
-        sirfsoc_alloc_gc(base, 0, 32);
-        sirfsoc_alloc_gc(base + 4, 32, SIRFSOC_NUM_IRQS - 32);
+                                                  &irq_generic_chip_ops, base);
+        sirfsoc_alloc_gc(base);
 
         writel_relaxed(0, base + SIRFSOC_INT_RISC_LEVEL0);
         writel_relaxed(0, base + SIRFSOC_INT_RISC_LEVEL1);