1 files changed, 139 insertions, 26 deletions

diff --git a/arch/m68knommu/platform/coldfire/intc-simr.c b/arch/m68knommu/platform/coldfire/intc-simr.c
index bb7048636140..e642b24ab729 100644
--- a/arch/m68knommu/platform/coldfire/intc-simr.c
+++ b/arch/m68knommu/platform/coldfire/intc-simr.c
@@ -3,7 +3,7 @@
  *
  * Interrupt controller code for the ColdFire 5208, 5207 & 532x parts.
  *
- * (C) Copyright 2009, Greg Ungerer <gerg@snapgear.com>
+ * (C) Copyright 2009-2011, Greg Ungerer <gerg@snapgear.com>
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file COPYING in the main directory of this archive
@@ -20,47 +20,156 @@
 #include <asm/mcfsim.h>
 #include <asm/traps.h>
 
-static void intc_irq_mask(unsigned int irq)
+/*
+ *      The EDGE Port interrupts are the fixed 7 external interrupts.
+ *      They need some special treatment, for example they need to be acked.
+ */
+#ifdef CONFIG_M520x
+/*
+ *      The 520x parts only support a limited range of these external
+ *      interrupts, only 1, 4 and 7 (as interrupts 65, 66 and 67).
+ */
+#define EINT0   64      /* Is not actually used, but spot reserved for it */
+#define EINT1   65      /* EDGE Port interrupt 1 */
+#define EINT4   66      /* EDGE Port interrupt 4 */
+#define EINT7   67      /* EDGE Port interrupt 7 */
+
+static unsigned int irqebitmap[] = { 0, 1, 4, 7 };
+static unsigned int inline irq2ebit(unsigned int irq)
 {
-        if (irq >= MCFINT_VECBASE) {
-                if (irq < MCFINT_VECBASE + 64)
-                        __raw_writeb(irq - MCFINT_VECBASE, MCFINTC0_SIMR);
-                else if ((irq < MCFINT_VECBASE + 128) && MCFINTC1_SIMR)
-                        __raw_writeb(irq - MCFINT_VECBASE - 64, MCFINTC1_SIMR);
-        }
+        return irqebitmap[irq - EINT0];
+}
+
+#else
+
+/*
+ *      Most of the ColdFire parts with the EDGE Port module just have
+ *      a strait direct mapping of the 7 external interrupts. Although
+ *      there is a bit reserved for 0, it is not used.
+ */
+#define EINT0   64      /* Is not actually used, but spot reserved for it */
+#define EINT1   65      /* EDGE Port interrupt 1 */
+#define EINT7   71      /* EDGE Port interrupt 7 */
+
+static unsigned int inline irq2ebit(unsigned int irq)
+{
+        return irq - EINT0;
+}
+
+#endif
+
+/*
+ *      There maybe one or two interrupt control units, each has 64
+ *      interrupts. If there is no second unit then MCFINTC1_* defines
+ *      will be 0 (and code for them optimized away).
+ */
+
+static void intc_irq_mask(struct irq_data *d)
+{
+        unsigned int irq = d->irq - MCFINT_VECBASE;
+
+        if (MCFINTC1_SIMR && (irq > 64))
+                __raw_writeb(irq - 64, MCFINTC1_SIMR);
+        else
+                __raw_writeb(irq, MCFINTC0_SIMR);
 }
 
-static void intc_irq_unmask(unsigned int irq)
+static void intc_irq_unmask(struct irq_data *d)
 {
-        if (irq >= MCFINT_VECBASE) {
-                if (irq < MCFINT_VECBASE + 64)
-                        __raw_writeb(irq - MCFINT_VECBASE, MCFINTC0_CIMR);
-                else if ((irq < MCFINT_VECBASE + 128) && MCFINTC1_CIMR)
-                        __raw_writeb(irq - MCFINT_VECBASE - 64, MCFINTC1_CIMR);
+        unsigned int irq = d->irq - MCFINT_VECBASE;
+
+        if (MCFINTC1_CIMR && (irq > 64))
+                __raw_writeb(irq - 64, MCFINTC1_CIMR);
+        else
+                __raw_writeb(irq, MCFINTC0_CIMR);
+}
+
+static void intc_irq_ack(struct irq_data *d)
+{
+        unsigned int ebit = irq2ebit(d->irq);
+
+        __raw_writeb(0x1 << ebit, MCFEPORT_EPFR);
+}
+
+static unsigned int intc_irq_startup(struct irq_data *d)
+{
+        unsigned int irq = d->irq;
+
+        if ((irq >= EINT1) && (irq <= EINT7)) {
+                unsigned int ebit = irq2ebit(irq);
+                u8 v;
+
+                /* Set EPORT line as input */
+                v = __raw_readb(MCFEPORT_EPDDR);
+                __raw_writeb(v & ~(0x1 << ebit), MCFEPORT_EPDDR);
+
+                /* Set EPORT line as interrupt source */
+                v = __raw_readb(MCFEPORT_EPIER);
+                __raw_writeb(v | (0x1 << ebit), MCFEPORT_EPIER);
         }
+
+        irq -= MCFINT_VECBASE;
+        if (MCFINTC1_ICR0 && (irq > 64))
+                __raw_writeb(5, MCFINTC1_ICR0 + irq - 64);
+        else
+                __raw_writeb(5, MCFINTC0_ICR0 + irq);
+
+
+        intc_irq_unmask(d);
+        return 0;
 }
 
-static int intc_irq_set_type(unsigned int irq, unsigned int type)
+static int intc_irq_set_type(struct irq_data *d, unsigned int type)
 {
-        if (irq >= MCFINT_VECBASE) {
-                if (irq < MCFINT_VECBASE + 64)
-                        __raw_writeb(5, MCFINTC0_ICR0 + irq - MCFINT_VECBASE);
-                else if ((irq < MCFINT_VECBASE) && MCFINTC1_ICR0)
-                        __raw_writeb(5, MCFINTC1_ICR0 + irq - MCFINT_VECBASE - 64);
+        unsigned int ebit, irq = d->irq;
+        u16 pa, tb;
+
+        switch (type) {
+        case IRQ_TYPE_EDGE_RISING:
+                tb = 0x1;
+                break;
+        case IRQ_TYPE_EDGE_FALLING:
+                tb = 0x2;
+                break;
+        case IRQ_TYPE_EDGE_BOTH:
+                tb = 0x3;
+                break;
+        default:
+                /* Level triggered */
+                tb = 0;
+                break;
         }
+
+        if (tb)
+                set_irq_handler(irq, handle_edge_irq);
+
+        ebit = irq2ebit(irq) * 2;
+        pa = __raw_readw(MCFEPORT_EPPAR);
+        pa = (pa & ~(0x3 << ebit)) | (tb << ebit);
+        __raw_writew(pa, MCFEPORT_EPPAR);
+        
         return 0;
 }
 
 static struct irq_chip intc_irq_chip = {
         .name           = "CF-INTC",
-        .mask           = intc_irq_mask,
-        .unmask         = intc_irq_unmask,
-        .set_type       = intc_irq_set_type,
+        .irq_startup    = intc_irq_startup,
+        .irq_mask       = intc_irq_mask,
+        .irq_unmask     = intc_irq_unmask,
+};
+
+static struct irq_chip intc_irq_chip_edge_port = {
+        .name           = "CF-INTC-EP",
+        .irq_startup    = intc_irq_startup,
+        .irq_mask       = intc_irq_mask,
+        .irq_unmask     = intc_irq_unmask,
+        .irq_ack        = intc_irq_ack,
+        .irq_set_type   = intc_irq_set_type,
 };
 
 void __init init_IRQ(void)
 {
-        int irq;
+        int irq, eirq;
 
         init_vectors();
 
@@ -69,8 +178,12 @@ void __init init_IRQ(void)
         if (MCFINTC1_SIMR)
                 __raw_writeb(0xff, MCFINTC1_SIMR);
 
-        for (irq = 0; (irq < NR_IRQS); irq++) {
-                set_irq_chip(irq, &intc_irq_chip);
+        eirq = MCFINT_VECBASE + 64 + (MCFINTC1_ICR0 ? 64 : 0);
+        for (irq = MCFINT_VECBASE; (irq < eirq); irq++) {
+                if ((irq >= EINT1) && (irq <= EINT7))
+                        set_irq_chip(irq, &intc_irq_chip_edge_port);
+                else
+                        set_irq_chip(irq, &intc_irq_chip);
                 set_irq_type(irq, IRQ_TYPE_LEVEL_HIGH);
                 set_irq_handler(irq, handle_level_irq);
         }