From 3ff63db204f4aaa7ef9ca6bbfa2d28aca40864b3 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Mon, 27 Apr 2009 15:09:29 +1000
Subject: [PATCH] --- yaml --- r: 162635 b: refs/heads/master c:
 cd3dd4068db5e1258a14b63e0feaf0332640d896 h: refs/heads/master i:   162633:
 8200530e121053f2b44c36ef5514af24ba88e687   162631:
 3de0a480fba2be5304c73fe091692521598bc1f8 v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/m68k/include/asm/m520xsim.h        |  2 +
 trunk/arch/m68knommu/kernel/irq.c             |  4 ++
 .../arch/m68knommu/platform/coldfire/Makefile |  2 +-
 .../m68knommu/platform/coldfire/intc-simr.c   | 61 +++++++++++++++++++
 5 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 trunk/arch/m68knommu/platform/coldfire/intc-simr.c

diff --git a/[refs] b/[refs]
index 056c087b35e2..45375dff6697 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 584320156b7e42e74105ca78bdf895d2b0269251
+refs/heads/master: cd3dd4068db5e1258a14b63e0feaf0332640d896
diff --git a/trunk/arch/m68k/include/asm/m520xsim.h b/trunk/arch/m68k/include/asm/m520xsim.h
index e80b6a54ea9c..e79b9bc76a12 100644
--- a/trunk/arch/m68k/include/asm/m520xsim.h
+++ b/trunk/arch/m68k/include/asm/m520xsim.h
@@ -22,6 +22,8 @@
 #define MCFINTC_IMRL        0x0c        /* Interrupt mask 1-31 */
 #define MCFINTC_INTFRCH     0x10        /* Interrupt force 32-63 */
 #define MCFINTC_INTFRCL     0x14        /* Interrupt force 1-31 */
+#define MCFINTC_SIMR        0x1c        /* Set interrupt mask 0-63 */
+#define MCFINTC_CIMR        0x1d        /* Clear interrupt mask 0-63 */
 #define MCFINTC_ICR0        0x40        /* Base ICR register */
 
 #define MCFINT_VECBASE      64
diff --git a/trunk/arch/m68knommu/kernel/irq.c b/trunk/arch/m68knommu/kernel/irq.c
index 9e0c100447ca..47f6af57e18e 100644
--- a/trunk/arch/m68knommu/kernel/irq.c
+++ b/trunk/arch/m68knommu/kernel/irq.c
@@ -29,6 +29,8 @@ asmlinkage void do_IRQ(int irq, struct pt_regs *regs)
 	set_irq_regs(oldregs);
 }
 
+#if !defined(CONFIG_M520x)
+
 static struct irq_chip m_irq_chip = {
 	.name		= "M68K-INTC",
 	.enable		= enable_vector,
@@ -50,6 +52,8 @@ void __init init_IRQ(void)
 	}
 }
 
+#endif
+
 int show_interrupts(struct seq_file *p, void *v)
 {
 	struct irqaction *ap;
diff --git a/trunk/arch/m68knommu/platform/coldfire/Makefile b/trunk/arch/m68knommu/platform/coldfire/Makefile
index 2667323c7fee..dd242db7daa1 100644
--- a/trunk/arch/m68knommu/platform/coldfire/Makefile
+++ b/trunk/arch/m68knommu/platform/coldfire/Makefile
@@ -17,7 +17,7 @@ asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1
 obj-$(CONFIG_COLDFIRE)	+= clk.o dma.o entry.o vectors.o
 obj-$(CONFIG_M5206)	+= timers.o
 obj-$(CONFIG_M5206e)	+= timers.o
-obj-$(CONFIG_M520x)	+= pit.o
+obj-$(CONFIG_M520x)	+= pit.o intc-simr.o
 obj-$(CONFIG_M523x)	+= pit.o dma_timer.o
 obj-$(CONFIG_M5249)	+= timers.o
 obj-$(CONFIG_M527x)	+= pit.o
diff --git a/trunk/arch/m68knommu/platform/coldfire/intc-simr.c b/trunk/arch/m68knommu/platform/coldfire/intc-simr.c
new file mode 100644
index 000000000000..3b614a3508fc
--- /dev/null
+++ b/trunk/arch/m68knommu/platform/coldfire/intc-simr.c
@@ -0,0 +1,61 @@
+/*
+ * intc-simr.c
+ *
+ * (C) Copyright 2009, 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
+ * for more details.
+ */
+
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/io.h>
+#include <asm/coldfire.h>
+#include <asm/mcfsim.h>
+#include <asm/traps.h>
+
+static void intc_irq_mask(unsigned int irq)
+{
+	if ((irq >= MCFINT_VECBASE) && (irq <= MCFINT_VECBASE + 63))
+		__raw_writeb(irq - MCFINT_VECBASE, MCF_IPSBAR + MCFICM_INTC0 + MCFINTC_SIMR);
+}
+
+static void intc_irq_unmask(unsigned int irq)
+{
+	if ((irq >= MCFINT_VECBASE) && (irq <= MCFINT_VECBASE + 63))
+		__raw_writeb(irq - MCFINT_VECBASE, MCF_IPSBAR + MCFICM_INTC0 + MCFINTC_CIMR);
+}
+
+static int intc_irq_set_type(unsigned int irq, unsigned int type)
+{
+	if ((irq >= MCFINT_VECBASE) && (irq <= MCFINT_VECBASE + 63))
+		__raw_writeb(5, MCF_IPSBAR + MCFICM_INTC0 + MCFINTC_ICR0 + irq - MCFINT_VECBASE);
+	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,
+};
+
+void __init init_IRQ(void)
+{
+	int irq;
+
+	init_vectors();
+
+	for (irq = 0; (irq < NR_IRQS); irq++) {
+		irq_desc[irq].status = IRQ_DISABLED;
+		irq_desc[irq].action = NULL;
+		irq_desc[irq].depth = 1;
+		irq_desc[irq].chip = &intc_irq_chip;
+		intc_irq_set_type(irq, 0);
+	}
+}
+