1 files changed, 11 insertions, 39 deletions

diff --git a/arch/arm/mach-ns9xxx/irq.c b/arch/arm/mach-ns9xxx/irq.c
index b8c7b00522e6..00001b874e97 100644
--- a/arch/arm/mach-ns9xxx/irq.c
+++ b/arch/arm/mach-ns9xxx/irq.c
@@ -9,6 +9,7 @@
  * the Free Software Foundation.
  */
 #include <linux/interrupt.h>
+#include <asm/io.h>
 #include <asm/mach/irq.h>
 #include <asm/mach-types.h>
 #include <asm/arch-ns9xxx/regs-sys.h>
@@ -17,48 +18,17 @@
 
 #include "generic.h"
 
-static void ns9xxx_ack_irq_timer(unsigned int irq)
-{
-        u32 tc = SYS_TC(irq - IRQ_TIMER0);
-
-        /*
-         * If the timer is programmed to halt on terminal count, the
-         * timer must be disabled before clearing the interrupt.
-         */
-        if (REGGET(tc, SYS_TCx, REN) == 0) {
-                REGSET(tc, SYS_TCx, TEN, DIS);
-                SYS_TC(irq - IRQ_TIMER0) = tc;
-        }
-
-        REGSET(tc, SYS_TCx, INTC, SET);
-        SYS_TC(irq - IRQ_TIMER0) = tc;
-
-        REGSET(tc, SYS_TCx, INTC, UNSET);
-        SYS_TC(irq - IRQ_TIMER0) = tc;
-}
-
-static void (*ns9xxx_ack_irq_functions[NR_IRQS])(unsigned int) = {
-        [IRQ_TIMER0] = ns9xxx_ack_irq_timer,
-        [IRQ_TIMER1] = ns9xxx_ack_irq_timer,
-        [IRQ_TIMER2] = ns9xxx_ack_irq_timer,
-        [IRQ_TIMER3] = ns9xxx_ack_irq_timer,
-};
-
 static void ns9xxx_mask_irq(unsigned int irq)
 {
         /* XXX: better use cpp symbols */
-        SYS_IC(irq / 4) &= ~(1 << (7 + 8 * (3 - (irq & 3))));
+        u32 ic = __raw_readl(SYS_IC(irq / 4));
+        ic &= ~(1 << (7 + 8 * (3 - (irq & 3))));
+        __raw_writel(ic, SYS_IC(irq / 4));
 }
 
 static void ns9xxx_ack_irq(unsigned int irq)
 {
-        if (!ns9xxx_ack_irq_functions[irq]) {
-                printk(KERN_ERR "no ack function for irq %u\n", irq);
-                BUG();
-        }
-
-        ns9xxx_ack_irq_functions[irq](irq);
-        SYS_ISRADDR = 0;
+        __raw_writel(0, SYS_ISRADDR);
 }
 
 static void ns9xxx_maskack_irq(unsigned int irq)
@@ -70,7 +40,9 @@ static void ns9xxx_maskack_irq(unsigned int irq)
 static void ns9xxx_unmask_irq(unsigned int irq)
 {
         /* XXX: better use cpp symbols */
-        SYS_IC(irq / 4) |= 1 << (7 + 8 * (3 - (irq & 3)));
+        u32 ic = __raw_readl(SYS_IC(irq / 4));
+        ic |= 1 << (7 + 8 * (3 - (irq & 3)));
+        __raw_writel(ic, SYS_IC(irq / 4));
 }
 
 static struct irq_chip ns9xxx_chip = {
@@ -86,14 +58,14 @@ void __init ns9xxx_init_irq(void)
 
         /* disable all IRQs */
         for (i = 0; i < 8; ++i)
-                SYS_IC(i) = (4 * i) << 24 | (4 * i + 1) << 16 |
-                        (4 * i + 2) << 8 | (4 * i + 3);
+                __raw_writel((4 * i) << 24 | (4 * i + 1) << 16 |
+                                (4 * i + 2) << 8 | (4 * i + 3), SYS_IC(i));
 
         /* simple interrupt prio table:
          * prio(x) < prio(y) <=> x < y
          */
         for (i = 0; i < 32; ++i)
-                SYS_IVA(i) = i;
+                __raw_writel(i, SYS_IVA(i));
 
         for (i = IRQ_WATCHDOG; i <= IRQ_EXT3; ++i) {
                 set_irq_chip(i, &ns9xxx_chip);