m32r: Rearrange platform-dependent codes

Rearrange platform-dependent codes from arch/m32r/kernel/*.c
to arch/m32r/platforms/{platform}/.

Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>

3 files changed, 527 insertions, 0 deletions

diff --git a/arch/m32r/platforms/mappi/Makefile b/arch/m32r/platforms/mappi/Makefile
new file mode 100644
index 000000000000..0de59084f21c
--- /dev/null
+++ b/arch/m32r/platforms/mappi/Makefile
@@ -0,0 +1 @@
+obj-y   := setup.o io.o
diff --git a/arch/m32r/platforms/mappi/io.c b/arch/m32r/platforms/mappi/io.c
new file mode 100644
index 000000000000..ac1c396d477d
--- /dev/null
+++ b/arch/m32r/platforms/mappi/io.c
@@ -0,0 +1,325 @@
+/*
+ *  linux/arch/m32r/platforms/mappi/io.c
+ *
+ *  Typical I/O routines for Mappi board.
+ *
+ *  Copyright (c) 2001-2005  Hiroyuki Kondo, Hirokazu Takata,
+ *                           Hitoshi Yamamoto
+ */
+
+#include <asm/m32r.h>
+#include <asm/page.h>
+#include <asm/io.h>
+#include <asm/byteorder.h>
+
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
+#include <linux/types.h>
+
+#define M32R_PCC_IOMAP_SIZE 0x1000
+
+#define M32R_PCC_IOSTART0 0x1000
+#define M32R_PCC_IOEND0   (M32R_PCC_IOSTART0 + M32R_PCC_IOMAP_SIZE - 1)
+#define M32R_PCC_IOSTART1 0x2000
+#define M32R_PCC_IOEND1   (M32R_PCC_IOSTART1 + M32R_PCC_IOMAP_SIZE - 1)
+
+extern void pcc_ioread(int, unsigned long, void *, size_t, size_t, int);
+extern void pcc_iowrite(int, unsigned long, void *, size_t, size_t, int);
+#endif /* CONFIG_PCMCIA && CONFIG_M32R_PCC */
+
+#define PORT2ADDR(port)  _port2addr(port)
+
+static inline void *_port2addr(unsigned long port)
+{
+        return (void *)(port | NONCACHE_OFFSET);
+}
+
+static inline void *_port2addr_ne(unsigned long port)
+{
+        return (void *)((port<<1) + NONCACHE_OFFSET + 0x0C000000);
+}
+
+static inline void delay(void)
+{
+        __asm__ __volatile__ ("push r0; \n\t pop r0;" : : :"memory");
+}
+
+/*
+ * NIC I/O function
+ */
+
+#define PORT2ADDR_NE(port)  _port2addr_ne(port)
+
+static inline unsigned char _ne_inb(void *portp)
+{
+        return (unsigned char) *(volatile unsigned short *)portp;
+}
+
+static inline unsigned short _ne_inw(void *portp)
+{
+        unsigned short tmp;
+
+        tmp = *(volatile unsigned short *)portp;
+        return le16_to_cpu(tmp);
+}
+
+static inline void _ne_outb(unsigned char b, void *portp)
+{
+        *(volatile unsigned short *)portp = (unsigned short)b;
+}
+
+static inline void _ne_outw(unsigned short w, void *portp)
+{
+        *(volatile unsigned short *)portp = cpu_to_le16(w);
+}
+
+unsigned char _inb(unsigned long port)
+{
+        if (port >= 0x300 && port < 0x320)
+                return _ne_inb(PORT2ADDR_NE(port));
+        else
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
+        if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
+                unsigned char b;
+                pcc_ioread(0, port, &b, sizeof(b), 1, 0);
+                return b;
+        } else  if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
+                unsigned char b;
+                pcc_ioread(1, port, &b, sizeof(b), 1, 0);
+                return b;
+        } else
+#endif
+
+        return *(volatile unsigned char *)PORT2ADDR(port);
+}
+
+unsigned short _inw(unsigned long port)
+{
+        if (port >= 0x300 && port < 0x320)
+                return _ne_inw(PORT2ADDR_NE(port));
+        else
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
+        if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
+                unsigned short w;
+                pcc_ioread(0, port, &w, sizeof(w), 1, 0);
+                return w;
+        } else  if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
+                unsigned short w;
+                pcc_ioread(1, port, &w, sizeof(w), 1, 0);
+                return w;
+        } else
+#endif
+        return *(volatile unsigned short *)PORT2ADDR(port);
+}
+
+unsigned long _inl(unsigned long port)
+{
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
+        if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
+                unsigned long l;
+                pcc_ioread(0, port, &l, sizeof(l), 1, 0);
+                return l;
+        } else  if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
+                unsigned short l;
+                pcc_ioread(1, port, &l, sizeof(l), 1, 0);
+                return l;
+        } else
+#endif
+        return *(volatile unsigned long *)PORT2ADDR(port);
+}
+
+unsigned char _inb_p(unsigned long port)
+{
+        unsigned char v = _inb(port);
+        delay();
+        return (v);
+}
+
+unsigned short _inw_p(unsigned long port)
+{
+        unsigned short v = _inw(port);
+        delay();
+        return (v);
+}
+
+unsigned long _inl_p(unsigned long port)
+{
+        unsigned long v = _inl(port);
+        delay();
+        return (v);
+}
+
+void _outb(unsigned char b, unsigned long port)
+{
+        if (port >= 0x300 && port < 0x320)
+                _ne_outb(b, PORT2ADDR_NE(port));
+        else
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
+        if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
+                pcc_iowrite(0, port, &b, sizeof(b), 1, 0);
+        } else  if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
+                pcc_iowrite(1, port, &b, sizeof(b), 1, 0);
+        } else
+#endif
+                *(volatile unsigned char *)PORT2ADDR(port) = b;
+}
+
+void _outw(unsigned short w, unsigned long port)
+{
+        if (port >= 0x300 && port < 0x320)
+                _ne_outw(w, PORT2ADDR_NE(port));
+        else
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
+        if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
+                pcc_iowrite(0, port, &w, sizeof(w), 1, 0);
+        } else  if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
+                pcc_iowrite(1, port, &w, sizeof(w), 1, 0);
+        } else
+#endif
+                *(volatile unsigned short *)PORT2ADDR(port) = w;
+}
+
+void _outl(unsigned long l, unsigned long port)
+{
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
+        if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
+                pcc_iowrite(0, port, &l, sizeof(l), 1, 0);
+        } else  if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
+                pcc_iowrite(1, port, &l, sizeof(l), 1, 0);
+        } else
+#endif
+        *(volatile unsigned long *)PORT2ADDR(port) = l;
+}
+
+void _outb_p(unsigned char b, unsigned long port)
+{
+        _outb(b, port);
+        delay();
+}
+
+void _outw_p(unsigned short w, unsigned long port)
+{
+        _outw(w, port);
+        delay();
+}
+
+void _outl_p(unsigned long l, unsigned long port)
+{
+        _outl(l, port);
+        delay();
+}
+
+void _insb(unsigned int port, void *addr, unsigned long count)
+{
+        unsigned short *buf = addr;
+        unsigned short *portp;
+
+        if (port >= 0x300 && port < 0x320){
+                portp = PORT2ADDR_NE(port);
+                while (count--)
+                        *buf++ = *(volatile unsigned char *)portp;
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
+        } else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
+                pcc_ioread(0, port, (void *)addr, sizeof(unsigned char),
+                           count, 1);
+        } else  if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
+                pcc_ioread(1, port, (void *)addr, sizeof(unsigned char),
+                           count, 1);
+#endif
+        } else {
+                portp = PORT2ADDR(port);
+                while (count--)
+                        *buf++ = *(volatile unsigned char *)portp;
+        }
+}
+
+void _insw(unsigned int port, void *addr, unsigned long count)
+{
+        unsigned short *buf = addr;
+        unsigned short *portp;
+
+        if (port >= 0x300 && port < 0x320) {
+                portp = PORT2ADDR_NE(port);
+                while (count--)
+                        *buf++ = _ne_inw(portp);
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
+        } else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
+                pcc_ioread(0, port, (void *)addr, sizeof(unsigned short),
+                           count, 1);
+        } else  if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
+                pcc_ioread(1, port, (void *)addr, sizeof(unsigned short),
+                           count, 1);
+#endif
+        } else {
+                portp = PORT2ADDR(port);
+                while (count--)
+                        *buf++ = *(volatile unsigned short *)portp;
+        }
+}
+
+void _insl(unsigned int port, void *addr, unsigned long count)
+{
+        unsigned long *buf = addr;
+        unsigned long *portp;
+
+        portp = PORT2ADDR(port);
+        while (count--)
+                *buf++ = *(volatile unsigned long *)portp;
+}
+
+void _outsb(unsigned int port, const void *addr, unsigned long count)
+{
+        const unsigned char *buf = addr;
+        unsigned char *portp;
+
+        if (port >= 0x300 && port < 0x320) {
+                portp = PORT2ADDR_NE(port);
+                while (count--)
+                        _ne_outb(*buf++, portp);
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
+        } else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
+                pcc_iowrite(0, port, (void *)addr, sizeof(unsigned char),
+                            count, 1);
+        } else if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
+                pcc_iowrite(1, port, (void *)addr, sizeof(unsigned char),
+                            count, 1);
+#endif
+        } else {
+                portp = PORT2ADDR(port);
+                while (count--)
+                        *(volatile unsigned char *)portp = *buf++;
+        }
+}
+
+void _outsw(unsigned int port, const void *addr, unsigned long count)
+{
+        const unsigned short *buf = addr;
+        unsigned short *portp;
+
+        if (port >= 0x300 && port < 0x320) {
+                portp = PORT2ADDR_NE(port);
+                while (count--)
+                        _ne_outw(*buf++, portp);
+#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
+        } else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
+                pcc_iowrite(0, port, (void *)addr, sizeof(unsigned short),
+                            count, 1);
+        } else  if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
+                pcc_iowrite(1, port, (void *)addr, sizeof(unsigned short),
+                            count, 1);
+#endif
+        } else {
+                portp = PORT2ADDR(port);
+                while (count--)
+                        *(volatile unsigned short *)portp = *buf++;
+        }
+}
+
+void _outsl(unsigned int port, const void *addr, unsigned long count)
+{
+        const unsigned long *buf = addr;
+        unsigned char *portp;
+
+        portp = PORT2ADDR(port);
+        while (count--)
+                *(volatile unsigned long *)portp = *buf++;
+}
diff --git a/arch/m32r/platforms/mappi/setup.c b/arch/m32r/platforms/mappi/setup.c
new file mode 100644
index 000000000000..3ec087ff2214
--- /dev/null
+++ b/arch/m32r/platforms/mappi/setup.c
@@ -0,0 +1,201 @@
+/*
+ *  linux/arch/m32r/platforms/mappi/setup.c
+ *
+ *  Setup routines for Renesas MAPPI Board
+ *
+ *  Copyright (c) 2001-2005  Hiroyuki Kondo, Hirokazu Takata,
+ *                           Hitoshi Yamamoto
+ */
+
+#include <linux/irq.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_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)))
+
+icu_data_t icu_data[NR_IRQS];
+
+static void disable_mappi_irq(unsigned int irq)
+{
+        unsigned long port, data;
+
+        port = irq2port(irq);
+        data = icu_data[irq].icucr|M32R_ICUCR_ILEVEL7;
+        outl(data, port);
+}
+
+static void enable_mappi_irq(unsigned int irq)
+{
+        unsigned long port, data;
+
+        port = irq2port(irq);
+        data = icu_data[irq].icucr|M32R_ICUCR_IEN|M32R_ICUCR_ILEVEL6;
+        outl(data, port);
+}
+
+static void mask_and_ack_mappi(unsigned int irq)
+{
+        disable_mappi_irq(irq);
+}
+
+static void end_mappi_irq(unsigned int irq)
+{
+        if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
+                enable_mappi_irq(irq);
+}
+
+static unsigned int startup_mappi_irq(unsigned int irq)
+{
+        enable_mappi_irq(irq);
+        return (0);
+}
+
+static void shutdown_mappi_irq(unsigned int irq)
+{
+        unsigned long port;
+
+        port = irq2port(irq);
+        outl(M32R_ICUCR_ILEVEL7, port);
+}
+
+static struct hw_interrupt_type mappi_irq_type =
+{
+        .typename = "MAPPI-IRQ",
+        .startup = startup_mappi_irq,
+        .shutdown = shutdown_mappi_irq,
+        .enable = enable_mappi_irq,
+        .disable = disable_mappi_irq,
+        .ack = mask_and_ack_mappi,
+        .end = end_mappi_irq
+};
+
+void __init init_IRQ(void)
+{
+        static int once = 0;
+
+        if (once)
+                return;
+        else
+                once++;
+
+#ifdef CONFIG_NE2000
+        /* INT0 : LAN controller (RTL8019AS) */
+        irq_desc[M32R_IRQ_INT0].status = IRQ_DISABLED;
+        irq_desc[M32R_IRQ_INT0].chip = &mappi_irq_type;
+        irq_desc[M32R_IRQ_INT0].action = NULL;
+        irq_desc[M32R_IRQ_INT0].depth = 1;
+        icu_data[M32R_IRQ_INT0].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD11;
+        disable_mappi_irq(M32R_IRQ_INT0);
+#endif /* CONFIG_M32R_NE2000 */
+
+        /* MFT2 : system timer */
+        irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED;
+        irq_desc[M32R_IRQ_MFT2].chip = &mappi_irq_type;
+        irq_desc[M32R_IRQ_MFT2].action = NULL;
+        irq_desc[M32R_IRQ_MFT2].depth = 1;
+        icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN;
+        disable_mappi_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].chip = &mappi_irq_type;
+        irq_desc[M32R_IRQ_SIO0_R].action = NULL;
+        irq_desc[M32R_IRQ_SIO0_R].depth = 1;
+        icu_data[M32R_IRQ_SIO0_R].icucr = 0;
+        disable_mappi_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].chip = &mappi_irq_type;
+        irq_desc[M32R_IRQ_SIO0_S].action = NULL;
+        irq_desc[M32R_IRQ_SIO0_S].depth = 1;
+        icu_data[M32R_IRQ_SIO0_S].icucr = 0;
+        disable_mappi_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].chip = &mappi_irq_type;
+        irq_desc[M32R_IRQ_SIO1_R].action = NULL;
+        irq_desc[M32R_IRQ_SIO1_R].depth = 1;
+        icu_data[M32R_IRQ_SIO1_R].icucr = 0;
+        disable_mappi_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].chip = &mappi_irq_type;
+        irq_desc[M32R_IRQ_SIO1_S].action = NULL;
+        irq_desc[M32R_IRQ_SIO1_S].depth = 1;
+        icu_data[M32R_IRQ_SIO1_S].icucr = 0;
+        disable_mappi_irq(M32R_IRQ_SIO1_S);
+#endif /* CONFIG_SERIAL_M32R_SIO */
+
+#if defined(CONFIG_M32R_PCC)
+        /* INT1 : pccard0 interrupt */
+        irq_desc[M32R_IRQ_INT1].status = IRQ_DISABLED;
+        irq_desc[M32R_IRQ_INT1].chip = &mappi_irq_type;
+        irq_desc[M32R_IRQ_INT1].action = NULL;
+        irq_desc[M32R_IRQ_INT1].depth = 1;
+        icu_data[M32R_IRQ_INT1].icucr = M32R_ICUCR_IEN | M32R_ICUCR_ISMOD00;
+        disable_mappi_irq(M32R_IRQ_INT1);
+
+        /* INT2 : pccard1 interrupt */
+        irq_desc[M32R_IRQ_INT2].status = IRQ_DISABLED;
+        irq_desc[M32R_IRQ_INT2].chip = &mappi_irq_type;
+        irq_desc[M32R_IRQ_INT2].action = NULL;
+        irq_desc[M32R_IRQ_INT2].depth = 1;
+        icu_data[M32R_IRQ_INT2].icucr = M32R_ICUCR_IEN | M32R_ICUCR_ISMOD00;
+        disable_mappi_irq(M32R_IRQ_INT2);
+#endif /* CONFIG_M32RPCC */
+}
+
+#if defined(CONFIG_FB_S1D13XXX)
+
+#include <video/s1d13xxxfb.h>
+#include <asm/s1d13806.h>
+
+static struct s1d13xxxfb_pdata s1d13xxxfb_data = {
+        .initregs               = s1d13xxxfb_initregs,
+        .initregssize           = ARRAY_SIZE(s1d13xxxfb_initregs),
+        .platform_init_video    = NULL,
+#ifdef CONFIG_PM
+        .platform_suspend_video = NULL,
+        .platform_resume_video  = NULL,
+#endif
+};
+
+static struct resource s1d13xxxfb_resources[] = {
+        [0] = {
+                .start  = 0x10200000UL,
+                .end    = 0x1033FFFFUL,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 0x10000000UL,
+                .end    = 0x100001FFUL,
+                .flags  = IORESOURCE_MEM,
+        }
+};
+
+static struct platform_device s1d13xxxfb_device = {
+        .name           = S1D_DEVICENAME,
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &s1d13xxxfb_data,
+        },
+        .num_resources  = ARRAY_SIZE(s1d13xxxfb_resources),
+        .resource       = s1d13xxxfb_resources,
+};
+
+static int __init platform_init(void)
+{
+        platform_device_register(&s1d13xxxfb_device);
+        return 0;
+}
+arch_initcall(platform_init);
+#endif