[ARM] 3817/1: iop3xx: split the iop3xx mach into iop32x and iop33x

Split the iop3xx mach type into iop32x and iop33x -- split the config
symbols, and move the code in the mach-iop3xx directory to the mach-iop32x
and mach-iop33x directories.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 129 insertions, 0 deletions

diff --git a/arch/arm/mach-iop33x/irq.c b/arch/arm/mach-iop33x/irq.c
new file mode 100644
index 000000000000..029fa78876a5
--- /dev/null
+++ b/arch/arm/mach-iop33x/irq.c
@@ -0,0 +1,129 @@
+/*
+ * linux/arch/arm/mach-iop33x/irq.c
+ *
+ * Generic IOP331 IRQ handling functionality
+ *
+ * Author: Dave Jiang <dave.jiang@intel.com>
+ * Copyright (C) 2003 Intel Corp.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ *
+ */
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/list.h>
+
+#include <asm/mach/irq.h>
+#include <asm/irq.h>
+#include <asm/hardware.h>
+
+#include <asm/mach-types.h>
+
+static u32 iop331_mask0 = 0;
+static u32 iop331_mask1 = 0;
+
+static inline void intctl_write0(u32 val)
+{
+    // INTCTL0
+        asm volatile("mcr p6,0,%0,c0,c0,0"::"r" (val));
+}
+
+static inline void intctl_write1(u32 val)
+{
+    // INTCTL1
+    asm volatile("mcr p6,0,%0,c1,c0,0"::"r" (val));
+}
+
+static inline void intstr_write0(u32 val)
+{
+    // INTSTR0
+        asm volatile("mcr p6,0,%0,c2,c0,0"::"r" (val));
+}
+
+static inline void intstr_write1(u32 val)
+{
+    // INTSTR1
+        asm volatile("mcr p6,0,%0,c3,c0,0"::"r" (val));
+}
+
+static void
+iop331_irq_mask1 (unsigned int irq)
+{
+        iop331_mask0 &= ~(1 << (irq - IOP331_IRQ_OFS));
+        intctl_write0(iop331_mask0);
+}
+
+static void
+iop331_irq_mask2 (unsigned int irq)
+{
+        iop331_mask1 &= ~(1 << (irq - IOP331_IRQ_OFS - 32));
+        intctl_write1(iop331_mask1);
+}
+
+static void
+iop331_irq_unmask1(unsigned int irq)
+{
+        iop331_mask0 |= (1 << (irq - IOP331_IRQ_OFS));
+        intctl_write0(iop331_mask0);
+}
+
+static void
+iop331_irq_unmask2(unsigned int irq)
+{
+        iop331_mask1 |= (1 << (irq - IOP331_IRQ_OFS - 32));
+        intctl_write1(iop331_mask1);
+}
+
+struct irq_chip iop331_irqchip1 = {
+        .name   = "IOP-1",
+        .ack    = iop331_irq_mask1,
+        .mask   = iop331_irq_mask1,
+        .unmask = iop331_irq_unmask1,
+};
+
+struct irq_chip iop331_irqchip2 = {
+        .name   = "IOP-2",
+        .ack    = iop331_irq_mask2,
+        .mask   = iop331_irq_mask2,
+        .unmask = iop331_irq_unmask2,
+};
+
+void __init iop331_init_irq(void)
+{
+        unsigned int i, tmp;
+
+        /* Enable access to coprocessor 6 for dealing with IRQs.
+         * From RMK:
+         * Basically, the Intel documentation here is poor.  It appears that
+         * you need to set the bit to be able to access the coprocessor from
+         * SVC mode.  Whether that allows access from user space or not is
+         * unclear.
+         */
+        asm volatile (
+                "mrc p15, 0, %0, c15, c1, 0\n\t"
+                "orr %0, %0, %1\n\t"
+                "mcr p15, 0, %0, c15, c1, 0\n\t"
+                /* The action is delayed, so we have to do this: */
+                "mrc p15, 0, %0, c15, c1, 0\n\t"
+                "mov %0, %0\n\t"
+                "sub pc, pc, #4"
+                : "=r" (tmp) : "i" (1 << 6) );
+
+        intctl_write0(0);               // disable all interrupts
+        intctl_write1(0);
+        intstr_write0(0);               // treat all as IRQ
+        intstr_write1(0);
+        if(machine_is_iq80331())        // all interrupts are inputs to chip
+                *IOP331_PCIIRSR = 0x0f;
+
+        for(i = IOP331_IRQ_OFS; i < NR_IRQS; i++)
+        {
+                set_irq_chip(i, (i < 32) ? &iop331_irqchip1 : &iop331_irqchip2);
+                set_irq_handler(i, do_level_IRQ);
+                set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
+        }
+}
+