[PATCH] m32r: Support M3A-2170(Mappi-III) platform

This patchset is for supporting a new m32r platform, M3A-2170(Mappi-III)
evaluation board.  An M32R chip multiprocessor is equipped on the board.
http://http://www.linux-m32r.org/eng/platform/platform.html

	* arch/m32r/Kconfig: Support Mappi-III platform.
	* arch/m32r/kernel/Makefile: ditto.
	* arch/m32r/kernel/io_mappi3.c: ditto.
	* arch/m32r/kernel/setup.c: ditto.
	* arch/m32r/kernel/setup_mappi3.c: ditto.
	* include/asm-m32r/m32102.h: ditto.
	* include/asm-m32r/m32r.h: ditto.
	* include/asm-m32r/mappi3/mappi3_pld.h: ditto.

	* include/asm-m32r/ide.h: CF support for Mappi-III.
	* arch/m32r/kernel/setup_mappi3.c: ditto.

	* arch/m32r/mappi3/defconfig.smp: A default config file for Mappi-III.
	* arch/m32r/mappi3/dot.gdbinit: A default .gdbinit file for Mappi-III.

	* arch/m32r/boot/compressed/m32r_sio.c: Modified for Mappi-III
	  - At boot time, m32r-g00ff bootloader makes MMU off for Mappi-III,
	    on the contrary it makes MMU on for Mappi-II.

	* arch/m32r/kernel/io_mappi2.c: Update comments.
	* arch/m32r/kernel/setup_mappi2.c: ditto.

Signed-off-by: Mamoru Sakugawa <sakugawa@linux-m32r.org>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 208 insertions, 0 deletions

diff --git a/arch/m32r/kernel/setup_mappi3.c b/arch/m32r/kernel/setup_mappi3.c
new file mode 100644
index 000000000000..72b5b7609cea
--- /dev/null
+++ b/arch/m32r/kernel/setup_mappi3.c
@@ -0,0 +1,208 @@
+/*
+ *  linux/arch/m32r/kernel/setup_mappi3.c
+ *
+ *  Setup routines for Renesas MAPPI-III(M3A-2170) Board
+ *
+ *  Copyright (c) 2001-2005   Hiroyuki Kondo, Hirokazu Takata,
+ *                            Hitoshi Yamamoto, Mamoru Sakugawa
+ */
+
+#include <linux/config.h>
+#include <linux/irq.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/device.h>
+
+#include <asm/system.h>
+#include <asm/m32r.h>
+#include <asm/io.h>
+
+#define irq2port(x) (M32R_ICU_CR1_PORTL + ((x - 1) * sizeof(unsigned long)))
+
+#ifndef CONFIG_SMP
+typedef struct {
+        unsigned long icucr;  /* ICU Control Register */
+} icu_data_t;
+#endif /* CONFIG_SMP */
+
+icu_data_t icu_data[NR_IRQS];
+
+static void disable_mappi3_irq(unsigned int irq)
+{
+        unsigned long port, data;
+
+        if ((irq == 0) ||(irq >= NR_IRQS))  {
+                printk("bad irq 0x%08x\n", irq);
+                return;
+        }
+        port = irq2port(irq);
+        data = icu_data[irq].icucr|M32R_ICUCR_ILEVEL7;
+        outl(data, port);
+}
+
+static void enable_mappi3_irq(unsigned int irq)
+{
+        unsigned long port, data;
+
+        if ((irq == 0) ||(irq >= NR_IRQS))  {
+                printk("bad irq 0x%08x\n", irq);
+                return;
+        }
+        port = irq2port(irq);
+        data = icu_data[irq].icucr|M32R_ICUCR_IEN|M32R_ICUCR_ILEVEL6;
+        outl(data, port);
+}
+
+static void mask_and_ack_mappi3(unsigned int irq)
+{
+        disable_mappi3_irq(irq);
+}
+
+static void end_mappi3_irq(unsigned int irq)
+{
+        enable_mappi3_irq(irq);
+}
+
+static unsigned int startup_mappi3_irq(unsigned int irq)
+{
+        enable_mappi3_irq(irq);
+        return (0);
+}
+
+static void shutdown_mappi3_irq(unsigned int irq)
+{
+        unsigned long port;
+
+        port = irq2port(irq);
+        outl(M32R_ICUCR_ILEVEL7, port);
+}
+
+static struct hw_interrupt_type mappi3_irq_type =
+{
+        "MAPPI3-IRQ",
+        startup_mappi3_irq,
+        shutdown_mappi3_irq,
+        enable_mappi3_irq,
+        disable_mappi3_irq,
+        mask_and_ack_mappi3,
+        end_mappi3_irq
+};
+
+void __init init_IRQ(void)
+{
+#if defined(CONFIG_SMC91X)
+        /* INT0 : LAN controller (SMC91111) */
+        irq_desc[M32R_IRQ_INT0].status = IRQ_DISABLED;
+        irq_desc[M32R_IRQ_INT0].handler = &mappi3_irq_type;
+        irq_desc[M32R_IRQ_INT0].action = 0;
+        irq_desc[M32R_IRQ_INT0].depth = 1;
+        icu_data[M32R_IRQ_INT0].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10;
+        disable_mappi3_irq(M32R_IRQ_INT0);
+#endif  /* CONFIG_SMC91X */
+
+        /* MFT2 : system timer */
+        irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED;
+        irq_desc[M32R_IRQ_MFT2].handler = &mappi3_irq_type;
+        irq_desc[M32R_IRQ_MFT2].action = 0;
+        irq_desc[M32R_IRQ_MFT2].depth = 1;
+        icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN;
+        disable_mappi3_irq(M32R_IRQ_MFT2);
+
+#ifdef CONFIG_SERIAL_M32R_SIO
+        /* SIO0_R : uart receive data */
+        irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED;
+        irq_desc[M32R_IRQ_SIO0_R].handler = &mappi3_irq_type;
+        irq_desc[M32R_IRQ_SIO0_R].action = 0;
+        irq_desc[M32R_IRQ_SIO0_R].depth = 1;
+        icu_data[M32R_IRQ_SIO0_R].icucr = 0;
+        disable_mappi3_irq(M32R_IRQ_SIO0_R);
+
+        /* SIO0_S : uart send data */
+        irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED;
+        irq_desc[M32R_IRQ_SIO0_S].handler = &mappi3_irq_type;
+        irq_desc[M32R_IRQ_SIO0_S].action = 0;
+        irq_desc[M32R_IRQ_SIO0_S].depth = 1;
+        icu_data[M32R_IRQ_SIO0_S].icucr = 0;
+        disable_mappi3_irq(M32R_IRQ_SIO0_S);
+        /* SIO1_R : uart receive data */
+        irq_desc[M32R_IRQ_SIO1_R].status = IRQ_DISABLED;
+        irq_desc[M32R_IRQ_SIO1_R].handler = &mappi3_irq_type;
+        irq_desc[M32R_IRQ_SIO1_R].action = 0;
+        irq_desc[M32R_IRQ_SIO1_R].depth = 1;
+        icu_data[M32R_IRQ_SIO1_R].icucr = 0;
+        disable_mappi3_irq(M32R_IRQ_SIO1_R);
+
+        /* SIO1_S : uart send data */
+        irq_desc[M32R_IRQ_SIO1_S].status = IRQ_DISABLED;
+        irq_desc[M32R_IRQ_SIO1_S].handler = &mappi3_irq_type;
+        irq_desc[M32R_IRQ_SIO1_S].action = 0;
+        irq_desc[M32R_IRQ_SIO1_S].depth = 1;
+        icu_data[M32R_IRQ_SIO1_S].icucr = 0;
+        disable_mappi3_irq(M32R_IRQ_SIO1_S);
+#endif  /* CONFIG_M32R_USE_DBG_CONSOLE */
+
+#if defined(CONFIG_USB)
+        /* INT1 : USB Host controller interrupt */
+        irq_desc[M32R_IRQ_INT1].status = IRQ_DISABLED;
+        irq_desc[M32R_IRQ_INT1].handler = &mappi3_irq_type;
+        irq_desc[M32R_IRQ_INT1].action = 0;
+        irq_desc[M32R_IRQ_INT1].depth = 1;
+        icu_data[M32R_IRQ_INT1].icucr = M32R_ICUCR_ISMOD01;
+        disable_mappi3_irq(M32R_IRQ_INT1);
+#endif /* CONFIG_USB */
+
+        /* ICUCR40: CFC IREQ */
+        irq_desc[PLD_IRQ_CFIREQ].status = IRQ_DISABLED;
+        irq_desc[PLD_IRQ_CFIREQ].handler = &mappi3_irq_type;
+        irq_desc[PLD_IRQ_CFIREQ].action = 0;
+        irq_desc[PLD_IRQ_CFIREQ].depth = 1;     /* disable nested irq */
+        icu_data[PLD_IRQ_CFIREQ].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD01;
+        disable_mappi3_irq(PLD_IRQ_CFIREQ);
+
+#if defined(CONFIG_M32R_CFC)
+        /* ICUCR41: CFC Insert */
+        irq_desc[PLD_IRQ_CFC_INSERT].status = IRQ_DISABLED;
+        irq_desc[PLD_IRQ_CFC_INSERT].handler = &mappi3_irq_type;
+        irq_desc[PLD_IRQ_CFC_INSERT].action = 0;
+        irq_desc[PLD_IRQ_CFC_INSERT].depth = 1; /* disable nested irq */
+        icu_data[PLD_IRQ_CFC_INSERT].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD00;
+        disable_mappi3_irq(PLD_IRQ_CFC_INSERT);
+
+        /* ICUCR42: CFC Eject */
+        irq_desc[PLD_IRQ_CFC_EJECT].status = IRQ_DISABLED;
+        irq_desc[PLD_IRQ_CFC_EJECT].handler = &mappi3_irq_type;
+        irq_desc[PLD_IRQ_CFC_EJECT].action = 0;
+        irq_desc[PLD_IRQ_CFC_EJECT].depth = 1;  /* disable nested irq */
+        icu_data[PLD_IRQ_CFC_EJECT].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10;
+        disable_mappi3_irq(PLD_IRQ_CFC_EJECT);
+#endif /* CONFIG_M32R_CFC */
+}
+
+#define LAN_IOSTART     0x300
+#define LAN_IOEND       0x320
+static struct resource smc91x_resources[] = {
+        [0] = {
+                .start  = (LAN_IOSTART),
+                .end    = (LAN_IOEND),
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = M32R_IRQ_INT0,
+                .end    = M32R_IRQ_INT0,
+                .flags  = IORESOURCE_IRQ,
+        }
+};
+
+static struct platform_device smc91x_device = {
+        .name           = "smc91x",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(smc91x_resources),
+        .resource       = smc91x_resources,
+};
+
+static int __init platform_init(void)
+{
+        platform_device_register(&smc91x_device);
+        return 0;
+}
+arch_initcall(platform_init);