[ARM] Convert asm/io.h to linux/io.h

[linux-2.6-omap-h63xx.git] / arch / arm / mach-ns9xxx / irq.c

diff --git a/arch/arm/mach-ns9xxx/irq.c b/arch/arm/mach-ns9xxx/irq.c
index bfd906be754ed83f637ed6ee74a536f5c36eda94..22e0eb6e9ec405416dd88d18ba0787794c2619fc 100644 (file)
--- a/arch/arm/mach-ns9xxx/irq.c
+++ b/arch/arm/mach-ns9xxx/irq.c
@@ -10,21 +10,25 @@
  */
 #include <linux/interrupt.h>
 #include <linux/kernel_stat.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/mach/irq.h>
-#include <asm/mach-types.h>
-#include <asm/arch-ns9xxx/regs-sys-common.h>
-#include <asm/arch-ns9xxx/irqs.h>
-#include <asm/arch-ns9xxx/board.h>
+#include <mach/regs-sys-common.h>
+#include <mach/irqs.h>
+#include <mach/board.h>
 
 #include "generic.h"
 
+/* simple interrupt prio table: prio(x) < prio(y) <=> x < y */
+#define irq2prio(i) (i)
+#define prio2irq(p) (p)
+
 static void ns9xxx_mask_irq(unsigned int irq)
 {
        /* XXX: better use cpp symbols */
-       u32 ic = __raw_readl(SYS_IC(irq / 4));
-       ic &= ~(1 << (7 + 8 * (3 - (irq & 3))));
-       __raw_writel(ic, SYS_IC(irq / 4));
+       int prio = irq2prio(irq);
+       u32 ic = __raw_readl(SYS_IC(prio / 4));
+       ic &= ~(1 << (7 + 8 * (3 - (prio & 3))));
+       __raw_writel(ic, SYS_IC(prio / 4));
 }
 
 static void ns9xxx_ack_irq(unsigned int irq)
@@ -41,9 +45,10 @@ static void ns9xxx_maskack_irq(unsigned int irq)
 static void ns9xxx_unmask_irq(unsigned int irq)
 {
        /* XXX: better use cpp symbols */
-       u32 ic = __raw_readl(SYS_IC(irq / 4));
-       ic |= 1 << (7 + 8 * (3 - (irq & 3)));
-       __raw_writel(ic, SYS_IC(irq / 4));
+       int prio = irq2prio(irq);
+       u32 ic = __raw_readl(SYS_IC(prio / 4));
+       ic |= 1 << (7 + 8 * (3 - (prio & 3)));
+       __raw_writel(ic, SYS_IC(prio / 4));
 }
 
 static struct irq_chip ns9xxx_chip = {
@@ -104,14 +109,14 @@ void __init ns9xxx_init_irq(void)
 
        /* disable all IRQs */
        for (i = 0; i < 8; ++i)
-               __raw_writel((4 * i) << 24 | (4 * i + 1) << 16 |
-                               (4 * i + 2) << 8 | (4 * i + 3), SYS_IC(i));
+               __raw_writel(prio2irq(4 * i) << 24 |
+                               prio2irq(4 * i + 1) << 16 |
+                               prio2irq(4 * i + 2) << 8 |
+                               prio2irq(4 * i + 3),
+                               SYS_IC(i));
 
-       /* simple interrupt prio table:
-        * prio(x) < prio(y) <=> x < y
-        */
        for (i = 0; i < 32; ++i)
-               __raw_writel(i, SYS_IVA(i));
+               __raw_writel(prio2irq(i), SYS_IVA(i));
 
        for (i = 0; i <= 31; ++i) {
                set_irq_chip(i, &ns9xxx_chip);