1 files changed, 45 insertions, 36 deletions

diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
index 196a9565a8dc..d354e0fe4477 100644
--- a/arch/arm/mach-omap2/irq.c
+++ b/arch/arm/mach-omap2/irq.c
@@ -16,14 +16,20 @@
 #include <linux/io.h>
 #include <mach/hardware.h>
 #include <asm/mach/irq.h>
-#include <asm/irq.h>
 
-#define INTC_REVISION   0x0000
-#define INTC_SYSCONFIG  0x0010
-#define INTC_SYSSTATUS  0x0014
-#define INTC_CONTROL    0x0048
-#define INTC_MIR_CLEAR0 0x0088
-#define INTC_MIR_SET0   0x008c
+
+/* selected INTC register offsets */
+
+#define INTC_REVISION           0x0000
+#define INTC_SYSCONFIG          0x0010
+#define INTC_SYSSTATUS          0x0014
+#define INTC_CONTROL            0x0048
+#define INTC_MIR_CLEAR0         0x0088
+#define INTC_MIR_SET0           0x008c
+#define INTC_PENDING_IRQ0       0x0098
+
+/* Number of IRQ state bits in each MIR register */
+#define IRQ_BITS_PER_REG        32
 
 /*
  * OMAP2 has a number of different interrupt controllers, each interrupt
@@ -32,48 +38,50 @@
  * for each bank.. when in doubt, consult the TRM.
  */
 static struct omap_irq_bank {
-        unsigned long base_reg;
+        void __iomem *base_reg;
         unsigned int nr_irqs;
 } __attribute__ ((aligned(4))) irq_banks[] = {
         {
                 /* MPU INTC */
-                .base_reg       = IO_ADDRESS(OMAP24XX_IC_BASE),
+                .base_reg       = 0,
                 .nr_irqs        = 96,
-        }, {
-                /* XXX: DSP INTC */
-        }
+        },
 };
 
+/* INTC bank register get/set */
+
+static void intc_bank_write_reg(u32 val, struct omap_irq_bank *bank, u16 reg)
+{
+        __raw_writel(val, bank->base_reg + reg);
+}
+
+static u32 intc_bank_read_reg(struct omap_irq_bank *bank, u16 reg)
+{
+        return __raw_readl(bank->base_reg + reg);
+}
+
 /* XXX: FIQ and additional INTC support (only MPU at the moment) */
 static void omap_ack_irq(unsigned int irq)
 {
-        __raw_writel(0x1, irq_banks[0].base_reg + INTC_CONTROL);
+        intc_bank_write_reg(0x1, &irq_banks[0], INTC_CONTROL);
 }
 
 static void omap_mask_irq(unsigned int irq)
 {
-        int offset = (irq >> 5) << 5;
+        int offset = irq & (~(IRQ_BITS_PER_REG - 1));
 
-        if (irq >= 64) {
-                irq %= 64;
-        } else if (irq >= 32) {
-                irq %= 32;
-        }
+        irq &= (IRQ_BITS_PER_REG - 1);
 
-        __raw_writel(1 << irq, irq_banks[0].base_reg + INTC_MIR_SET0 + offset);
+        intc_bank_write_reg(1 << irq, &irq_banks[0], INTC_MIR_SET0 + offset);
 }
 
 static void omap_unmask_irq(unsigned int irq)
 {
-        int offset = (irq >> 5) << 5;
+        int offset = irq & (~(IRQ_BITS_PER_REG - 1));
 
-        if (irq >= 64) {
-                irq %= 64;
-        } else if (irq >= 32) {
-                irq %= 32;
-        }
+        irq &= (IRQ_BITS_PER_REG - 1);
 
-        __raw_writel(1 << irq, irq_banks[0].base_reg + INTC_MIR_CLEAR0 + offset);
+        intc_bank_write_reg(1 << irq, &irq_banks[0], INTC_MIR_CLEAR0 + offset);
 }
 
 static void omap_mask_ack_irq(unsigned int irq)
@@ -93,20 +101,20 @@ static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank)
 {
         unsigned long tmp;
 
-        tmp = __raw_readl(bank->base_reg + INTC_REVISION) & 0xff;
-        printk(KERN_INFO "IRQ: Found an INTC at 0x%08lx "
+        tmp = intc_bank_read_reg(bank, INTC_REVISION) & 0xff;
+        printk(KERN_INFO "IRQ: Found an INTC at 0x%p "
                          "(revision %ld.%ld) with %d interrupts\n",
                          bank->base_reg, tmp >> 4, tmp & 0xf, bank->nr_irqs);
 
-        tmp = __raw_readl(bank->base_reg + INTC_SYSCONFIG);
+        tmp = intc_bank_read_reg(bank, INTC_SYSCONFIG);
         tmp |= 1 << 1;  /* soft reset */
-        __raw_writel(tmp, bank->base_reg + INTC_SYSCONFIG);
+        intc_bank_write_reg(tmp, bank, INTC_SYSCONFIG);
 
-        while (!(__raw_readl(bank->base_reg + INTC_SYSSTATUS) & 0x1))
+        while (!(intc_bank_read_reg(bank, INTC_SYSSTATUS) & 0x1))
                 /* Wait for reset to complete */;
 
         /* Enable autoidle */
-        __raw_writel(1 << 0, bank->base_reg + INTC_SYSCONFIG);
+        intc_bank_write_reg(1 << 0, bank, INTC_SYSCONFIG);
 }
 
 void __init omap_init_irq(void)
@@ -118,9 +126,10 @@ void __init omap_init_irq(void)
         for (i = 0; i < ARRAY_SIZE(irq_banks); i++) {
                 struct omap_irq_bank *bank = irq_banks + i;
 
-                /* XXX */
-                if (!bank->base_reg)
-                        continue;
+                if (cpu_is_omap24xx())
+                        bank->base_reg = OMAP2_IO_ADDRESS(OMAP24XX_IC_BASE);
+                else if (cpu_is_omap34xx())
+                        bank->base_reg = OMAP2_IO_ADDRESS(OMAP34XX_IC_BASE);
 
                 omap_irq_bank_init_one(bank);