sh: rts7751r2d board updates.

This tidies up some of the rts7751r2d mess and gets it booting
again. Update the defconfig, too.

Signed-off-by: Masayuki Hosokawa <hosokawa@ace-jp.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

4 files changed, 87 insertions, 420 deletions

diff --git a/arch/sh/boards/renesas/rts7751r2d/Makefile b/arch/sh/boards/renesas/rts7751r2d/Makefile
index 833de1eac0e8..0d4c75a72be0 100644
--- a/arch/sh/boards/renesas/rts7751r2d/Makefile
+++ b/arch/sh/boards/renesas/rts7751r2d/Makefile
@@ -2,4 +2,4 @@
 # Makefile for the RTS7751R2D specific parts of the kernel
 #
 
-obj-y    := setup.o io.o irq.o
+obj-y    := setup.o irq.o
diff --git a/arch/sh/boards/renesas/rts7751r2d/io.c b/arch/sh/boards/renesas/rts7751r2d/io.c
deleted file mode 100644
index f2507a804979..000000000000
--- a/arch/sh/boards/renesas/rts7751r2d/io.c
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * Copyright (C) 2001  Ian da Silva, Jeremy Siegel
- * Based largely on io_se.c.
- *
- * I/O routine for Renesas Technology sales RTS7751R2D.
- *
- * Initial version only to support LAN access; some
- * placeholder code from io_rts7751r2d.c left in with the
- * expectation of later SuperIO and PCMCIA access.
- */
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/io.h>
-#include <asm/rts7751r2d.h>
-#include <asm/addrspace.h>
-
-/*
- * The 7751R RTS7751R2D uses the built-in PCI controller (PCIC)
- * of the 7751R processor, and has a SuperIO accessible via the PCI.
- * The board also includes a PCMCIA controller on its memory bus,
- * like the other Solution Engine boards.
- */
-
-static inline unsigned long port2adr(unsigned int port)
-{
-        if ((0x1f0 <= port && port < 0x1f8) || port == 0x3f6)
-                if (port == 0x3f6)
-                        return (PA_AREA5_IO + 0x80c);
-                else
-                        return (PA_AREA5_IO + 0x1000 + ((port-0x1f0) << 1));
-        else
-                maybebadio((unsigned long)port);
-
-        return port;
-}
-
-static inline unsigned long port88796l(unsigned int port, int flag)
-{
-        unsigned long addr;
-
-        if (flag)
-                addr = PA_AX88796L + ((port - AX88796L_IO_BASE) << 1);
-        else
-                addr = PA_AX88796L + ((port - AX88796L_IO_BASE) << 1) + 0x1000;
-
-        return addr;
-}
-
-/* The 7751R RTS7751R2D seems to have everything hooked */
-/* up pretty normally (nothing on high-bytes only...) so this */
-/* shouldn't be needed */
-static inline int shifted_port(unsigned long port)
-{
-        /* For IDE registers, value is not shifted */
-        if ((0x1f0 <= port && port < 0x1f8) || port == 0x3f6)
-                return 0;
-        else
-                return 1;
-}
-
-#if defined(CONFIG_NE2000) || defined(CONFIG_NE2000_MODULE)
-#define CHECK_AX88796L_PORT(port) \
-  ((port >= AX88796L_IO_BASE) && (port < (AX88796L_IO_BASE+0x20)))
-#else
-#define CHECK_AX88796L_PORT(port) (0)
-#endif
-
-/*
- * General outline: remap really low stuff [eventually] to SuperIO,
- * stuff in PCI IO space (at or above window at pci.h:PCIBIOS_MIN_IO)
- * is mapped through the PCI IO window.  Stuff with high bits (PXSEG)
- * should be way beyond the window, and is used  w/o translation for
- * compatibility.
- */
-unsigned char rts7751r2d_inb(unsigned long port)
-{
-        if (CHECK_AX88796L_PORT(port))
-                return (*(volatile unsigned short *)port88796l(port, 0)) & 0xff;
-        else if (PXSEG(port))
-                return *(volatile unsigned char *)port;
-        else if (is_pci_ioaddr(port) || shifted_port(port))
-                return *(volatile unsigned char *)pci_ioaddr(port);
-        else
-                return (*(volatile unsigned short *)port2adr(port) & 0xff);
-}
-
-unsigned char rts7751r2d_inb_p(unsigned long port)
-{
-        unsigned char v;
-
-        if (CHECK_AX88796L_PORT(port))
-                v = (*(volatile unsigned short *)port88796l(port, 0)) & 0xff;
-        else if (PXSEG(port))
-                v = *(volatile unsigned char *)port;
-        else if (is_pci_ioaddr(port) || shifted_port(port))
-                v = *(volatile unsigned char *)pci_ioaddr(port);
-        else
-                v = (*(volatile unsigned short *)port2adr(port) & 0xff);
-
-        ctrl_delay();
-
-        return v;
-}
-
-unsigned short rts7751r2d_inw(unsigned long port)
-{
-        if (CHECK_AX88796L_PORT(port))
-                maybebadio(port);
-        else if (PXSEG(port))
-                return *(volatile unsigned short *)port;
-        else if (is_pci_ioaddr(port) || shifted_port(port))
-                return *(volatile unsigned short *)pci_ioaddr(port);
-        else
-                maybebadio(port);
-
-        return 0;
-}
-
-unsigned int rts7751r2d_inl(unsigned long port)
-{
-        if (CHECK_AX88796L_PORT(port))
-                maybebadio(port);
-        else if (PXSEG(port))
-                return *(volatile unsigned long *)port;
-        else if (is_pci_ioaddr(port) || shifted_port(port))
-                return *(volatile unsigned long *)pci_ioaddr(port);
-        else
-                maybebadio(port);
-
-        return 0;
-}
-
-void rts7751r2d_outb(unsigned char value, unsigned long port)
-{
-        if (CHECK_AX88796L_PORT(port))
-                *((volatile unsigned short *)port88796l(port, 0)) = value;
-        else if (PXSEG(port))
-                *(volatile unsigned char *)port = value;
-        else if (is_pci_ioaddr(port) || shifted_port(port))
-                *(volatile unsigned char *)pci_ioaddr(port) = value;
-        else
-                *(volatile unsigned short *)port2adr(port) = value;
-}
-
-void rts7751r2d_outb_p(unsigned char value, unsigned long port)
-{
-        if (CHECK_AX88796L_PORT(port))
-                *((volatile unsigned short *)port88796l(port, 0)) = value;
-        else if (PXSEG(port))
-                *(volatile unsigned char *)port = value;
-        else if (is_pci_ioaddr(port) || shifted_port(port))
-                *(volatile unsigned char *)pci_ioaddr(port) = value;
-        else
-                *(volatile unsigned short *)port2adr(port) = value;
-
-        ctrl_delay();
-}
-
-void rts7751r2d_outw(unsigned short value, unsigned long port)
-{
-        if (CHECK_AX88796L_PORT(port))
-                maybebadio(port);
-        else if (PXSEG(port))
-                *(volatile unsigned short *)port = value;
-        else if (is_pci_ioaddr(port) || shifted_port(port))
-                *(volatile unsigned short *)pci_ioaddr(port) = value;
-        else
-                maybebadio(port);
-}
-
-void rts7751r2d_outl(unsigned int value, unsigned long port)
-{
-        if (CHECK_AX88796L_PORT(port))
-                maybebadio(port);
-        else if (PXSEG(port))
-                *(volatile unsigned long *)port = value;
-        else if (is_pci_ioaddr(port) || shifted_port(port))
-                *(volatile unsigned long *)pci_ioaddr(port) = value;
-        else
-                maybebadio(port);
-}
-
-void rts7751r2d_insb(unsigned long port, void *addr, unsigned long count)
-{
-        unsigned long a = (unsigned long)addr;
-        volatile __u8 *bp;
-        volatile __u16 *p;
-
-        if (CHECK_AX88796L_PORT(port)) {
-                p = (volatile unsigned short *)port88796l(port, 0);
-                while (count--)
-                        ctrl_outb(*p & 0xff, a++);
-        } else if (PXSEG(port))
-                while (count--)
-                        ctrl_outb(ctrl_inb(port), a++);
-        else if (is_pci_ioaddr(port) || shifted_port(port)) {
-                bp = (__u8 *)pci_ioaddr(port);
-                while (count--)
-                        ctrl_outb(*bp, a++);
-        } else {
-                p = (volatile unsigned short *)port2adr(port);
-                while (count--)
-                        ctrl_outb(*p & 0xff, a++);
-        }
-}
-
-void rts7751r2d_insw(unsigned long port, void *addr, unsigned long count)
-{
-        unsigned long a = (unsigned long)addr;
-        volatile __u16 *p;
-
-        if (CHECK_AX88796L_PORT(port))
-                p = (volatile unsigned short *)port88796l(port, 1);
-        else if (PXSEG(port))
-                p = (volatile unsigned short *)port;
-        else if (is_pci_ioaddr(port) || shifted_port(port))
-                p = (volatile unsigned short *)pci_ioaddr(port);
-        else
-                p = (volatile unsigned short *)port2adr(port);
-        while (count--)
-                ctrl_outw(*p, a++);
-}
-
-void rts7751r2d_insl(unsigned long port, void *addr, unsigned long count)
-{
-        if (CHECK_AX88796L_PORT(port))
-                maybebadio(port);
-        else if (is_pci_ioaddr(port) || shifted_port(port)) {
-                unsigned long a = (unsigned long)addr;
-
-                while (count--) {
-                        ctrl_outl(ctrl_inl(pci_ioaddr(port)), a);
-                        a += 4;
-                }
-        } else
-                maybebadio(port);
-}
-
-void rts7751r2d_outsb(unsigned long port, const void *addr, unsigned long count)
-{
-        unsigned long a = (unsigned long)addr;
-        volatile __u8 *bp;
-        volatile __u16 *p;
-
-        if (CHECK_AX88796L_PORT(port)) {
-                p = (volatile unsigned short *)port88796l(port, 0);
-                while (count--)
-                        *p = ctrl_inb(a++);
-        } else if (PXSEG(port))
-                while (count--)
-                        ctrl_outb(a++, port);
-        else if (is_pci_ioaddr(port) || shifted_port(port)) {
-                bp = (__u8 *)pci_ioaddr(port);
-                while (count--)
-                        *bp = ctrl_inb(a++);
-        } else {
-                p = (volatile unsigned short *)port2adr(port);
-                while (count--)
-                        *p = ctrl_inb(a++);
-        }
-}
-
-void rts7751r2d_outsw(unsigned long port, const void *addr, unsigned long count)
-{
-        unsigned long a = (unsigned long)addr;
-        volatile __u16 *p;
-
-        if (CHECK_AX88796L_PORT(port))
-                p = (volatile unsigned short *)port88796l(port, 1);
-        else if (PXSEG(port))
-                p = (volatile unsigned short *)port;
-        else if (is_pci_ioaddr(port) || shifted_port(port))
-                p = (volatile unsigned short *)pci_ioaddr(port);
-        else
-                p = (volatile unsigned short *)port2adr(port);
-
-        while (count--) {
-                ctrl_outw(*p, a);
-                a += 2;
-        }
-}
-
-void rts7751r2d_outsl(unsigned long port, const void *addr, unsigned long count)
-{
-        if (CHECK_AX88796L_PORT(port))
-                maybebadio(port);
-        else if (is_pci_ioaddr(port) || shifted_port(port)) {
-                unsigned long a = (unsigned long)addr;
-
-                while (count--) {
-                        ctrl_outl(ctrl_inl(a), pci_ioaddr(port));
-                        a += 4;
-                }
-        } else
-                maybebadio(port);
-}
-
-unsigned long rts7751r2d_isa_port2addr(unsigned long offset)
-{
-        return port2adr(offset);
-}
diff --git a/arch/sh/boards/renesas/rts7751r2d/irq.c b/arch/sh/boards/renesas/rts7751r2d/irq.c
index cb0eb20d1b43..0bae9041aceb 100644
--- a/arch/sh/boards/renesas/rts7751r2d/irq.c
+++ b/arch/sh/boards/renesas/rts7751r2d/irq.c
@@ -9,7 +9,9 @@
  * Atom Create Engineering Co., Ltd. 2002.
  */
 #include <linux/init.h>
+#include <linux/interrupt.h>
 #include <linux/irq.h>
+#include <linux/interrupt.h>
 #include <linux/io.h>
 #include <asm/rts7751r2d.h>
 
@@ -22,79 +24,31 @@ static int mask_pos[] = {6, 11, 9, 8, 12, 10, 5, 4, 7, 14, 13, 0, 0, 0, 0};
 extern int voyagergx_irq_demux(int irq);
 extern void setup_voyagergx_irq(void);
 
-static void enable_rts7751r2d_irq(unsigned int irq);
-static void disable_rts7751r2d_irq(unsigned int irq);
-
-/* shutdown is same as "disable" */
-#define shutdown_rts7751r2d_irq disable_rts7751r2d_irq
-
-static void ack_rts7751r2d_irq(unsigned int irq);
-static void end_rts7751r2d_irq(unsigned int irq);
-
-static unsigned int startup_rts7751r2d_irq(unsigned int irq)
+static void enable_rts7751r2d_irq(unsigned int irq)
 {
-        enable_rts7751r2d_irq(irq);
-        return 0; /* never anything pending */
+        /* Set priority in IPR back to original value */
+        ctrl_outw(ctrl_inw(IRLCNTR1) | (1 << mask_pos[irq]), IRLCNTR1);
 }
 
 static void disable_rts7751r2d_irq(unsigned int irq)
 {
-        unsigned short val;
-        unsigned short mask = 0xffff ^ (0x0001 << mask_pos[irq]);
-
         /* Set the priority in IPR to 0 */
-        val = ctrl_inw(IRLCNTR1);
-        val &= mask;
-        ctrl_outw(val, IRLCNTR1);
-}
-
-static void enable_rts7751r2d_irq(unsigned int irq)
-{
-        unsigned short val;
-        unsigned short value = (0x0001 << mask_pos[irq]);
-
-        /* Set priority in IPR back to original value */
-        val = ctrl_inw(IRLCNTR1);
-        val |= value;
-        ctrl_outw(val, IRLCNTR1);
+        ctrl_outw(ctrl_inw(IRLCNTR1) & (0xffff ^ (1 << mask_pos[irq])),
+                  IRLCNTR1);
 }
 
 int rts7751r2d_irq_demux(int irq)
 {
-        int demux_irq;
-
-        demux_irq = voyagergx_irq_demux(irq);
-        return demux_irq;
-}
-
-static void ack_rts7751r2d_irq(unsigned int irq)
-{
-        disable_rts7751r2d_irq(irq);
+        return voyagergx_irq_demux(irq);
 }
 
-static void end_rts7751r2d_irq(unsigned int irq)
-{
-        if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
-                enable_rts7751r2d_irq(irq);
-}
-
-static struct hw_interrupt_type rts7751r2d_irq_type = {
-        .typename = "RTS7751R2D IRQ",
-        .startup = startup_rts7751r2d_irq,
-        .shutdown = shutdown_rts7751r2d_irq,
-        .enable = enable_rts7751r2d_irq,
-        .disable = disable_rts7751r2d_irq,
-        .ack = ack_rts7751r2d_irq,
-        .end = end_rts7751r2d_irq,
+static struct irq_chip rts7751r2d_irq_chip __read_mostly = {
+        .name           = "rts7751r2d",
+        .mask           = disable_rts7751r2d_irq,
+        .unmask         = enable_rts7751r2d_irq,
+        .mask_ack       = disable_rts7751r2d_irq,
 };
 
-static void make_rts7751r2d_irq(unsigned int irq)
-{
-        disable_irq_nosync(irq);
-        irq_desc[irq].chip = &rts7751r2d_irq_type;
-        disable_rts7751r2d_irq(irq);
-}
-
 /*
  * Initialize IRQ setting
  */
@@ -119,8 +73,12 @@ void __init init_rts7751r2d_IRQ(void)
          * IRL14=Extention #3
          */
 
-        for (i=0; i<15; i++)
-                make_rts7751r2d_irq(i);
+        for (i=0; i<15; i++) {
+                disable_irq_nosync(i);
+                set_irq_chip_and_handler_name(i, &rts7751r2d_irq_chip,
+                                              handle_level_irq, "level");
+                enable_rts7751r2d_irq(i);
+        }
 
         setup_voyagergx_irq();
 }
diff --git a/arch/sh/boards/renesas/rts7751r2d/setup.c b/arch/sh/boards/renesas/rts7751r2d/setup.c
index d97be1202245..44b42082a0af 100644
--- a/arch/sh/boards/renesas/rts7751r2d/setup.c
+++ b/arch/sh/boards/renesas/rts7751r2d/setup.c
@@ -1,8 +1,8 @@
 /*
  * Renesas Technology Sales RTS7751R2D Support.
  *
- * Copyright (C) 2002 Atom Create Engineering Co., Ltd.
- * Copyright (C) 2004 - 2006 Paul Mundt
+ * Copyright (C) 2002 - 2006 Atom Create Engineering Co., Ltd.
+ * Copyright (C) 2004 - 2007 Paul Mundt
  *
  * 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
@@ -10,33 +10,13 @@
  */
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/pata_platform.h>
 #include <linux/serial_8250.h>
 #include <linux/pm.h>
 #include <asm/machvec.h>
-#include <asm/mach/rts7751r2d.h>
-#include <asm/io.h>
+#include <asm/rts7751r2d.h>
 #include <asm/voyagergx.h>
-
-extern void heartbeat_rts7751r2d(void);
-extern void init_rts7751r2d_IRQ(void);
-extern int rts7751r2d_irq_demux(int irq);
-
-extern void *voyagergx_consistent_alloc(struct device *, size_t, dma_addr_t *, gfp_t);
-extern int voyagergx_consistent_free(struct device *, size_t, void *, dma_addr_t);
-
-static struct plat_serial8250_port uart_platform_data[] = {
-        {
-                .membase        = (void *)VOYAGER_UART_BASE,
-                .mapbase        = VOYAGER_UART_BASE,
-                .iotype         = UPIO_MEM,
-                .irq            = VOYAGER_UART0_IRQ,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .regshift       = 2,
-                .uartclk        = (9600 * 16),
-        }, {
-                .flags          = 0,
-        },
-};
+#include <asm/io.h>
 
 static void __init voyagergx_serial_init(void)
 {
@@ -45,25 +25,72 @@ static void __init voyagergx_serial_init(void)
         /*
          * GPIO Control
          */
-        val = inl(GPIO_MUX_HIGH);
+        val = readl((void __iomem *)GPIO_MUX_HIGH);
         val |= 0x00001fe0;
-        outl(val, GPIO_MUX_HIGH);
+        writel(val, (void __iomem *)GPIO_MUX_HIGH);
 
         /*
          * Power Mode Gate
          */
-        val = inl(POWER_MODE0_GATE);
+        val = readl((void __iomem *)POWER_MODE0_GATE);
         val |= (POWER_MODE0_GATE_U0 | POWER_MODE0_GATE_U1);
-        outl(val, POWER_MODE0_GATE);
+        writel(val, (void __iomem *)POWER_MODE0_GATE);
 
-        val = inl(POWER_MODE1_GATE);
+        val = readl((void __iomem *)POWER_MODE1_GATE);
         val |= (POWER_MODE1_GATE_U0 | POWER_MODE1_GATE_U1);
-        outl(val, POWER_MODE1_GATE);
+        writel(val, (void __iomem *)POWER_MODE1_GATE);
 }
 
+static struct resource cf_ide_resources[] = {
+        [0] = {
+                .start  = PA_AREA5_IO + 0x1000,
+                .end    = PA_AREA5_IO + 0x1000 + 0x08 - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = PA_AREA5_IO + 0x80c,
+                .end    = PA_AREA5_IO + 0x80c + 0x16 - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [2] = {
+#ifdef CONFIG_RTS7751R2D_REV11
+                .start  = 1,
+#else
+                .start  = 2,
+#endif
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct pata_platform_info pata_info = {
+        .ioport_shift   = 1,
+};
+
+static struct platform_device cf_ide_device  = {
+        .name           = "pata_platform",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(cf_ide_resources),
+        .resource       = cf_ide_resources,
+        .dev    = {
+                .platform_data  = &pata_info,
+        },
+};
+
+static struct plat_serial8250_port uart_platform_data[] = {
+        {
+                .membase        = (void __iomem *)VOYAGER_UART_BASE,
+                .mapbase        = VOYAGER_UART_BASE,
+                .iotype         = UPIO_MEM,
+                .irq            = VOYAGER_UART0_IRQ,
+                .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
+                .regshift       = 2,
+                .uartclk        = (9600 * 16),
+        }
+};
+
 static struct platform_device uart_device = {
         .name           = "serial8250",
-        .id             = -1,
+        .id             = PLAT8250_DEV_PLATFORM,
         .dev            = {
                 .platform_data  = uart_platform_data,
         },
@@ -87,6 +114,7 @@ static struct platform_device heartbeat_device = {
 static struct platform_device *rts7751r2d_devices[] __initdata = {
         &uart_device,
         &heartbeat_device,
+        &cf_ide_device,
 };
 
 static int __init rts7751r2d_devices_setup(void)
@@ -94,6 +122,7 @@ static int __init rts7751r2d_devices_setup(void)
         return platform_add_devices(rts7751r2d_devices,
                                     ARRAY_SIZE(rts7751r2d_devices));
 }
+__initcall(rts7751r2d_devices_setup);
 
 static void rts7751r2d_power_off(void)
 {
@@ -105,14 +134,17 @@ static void rts7751r2d_power_off(void)
  */
 static void __init rts7751r2d_setup(char **cmdline_p)
 {
-        device_initcall(rts7751r2d_devices_setup);
+        u16 ver = ctrl_inw(PA_VERREG);
+
+        printk(KERN_INFO "Renesas Technology Sales RTS7751R2D support.\n");
+
+        printk(KERN_INFO "FPGA version:%d (revision:%d)\n",
+                                        (ver >> 4) & 0xf, ver & 0xf);
 
         ctrl_outw(0x0000, PA_OUTPORT);
         pm_power_off = rts7751r2d_power_off;
 
         voyagergx_serial_init();
-
-        printk(KERN_INFO "Renesas Technology Sales RTS7751R2D support.\n");
 }
 
 /*
@@ -123,27 +155,6 @@ struct sh_machine_vector mv_rts7751r2d __initmv = {
         .mv_setup               = rts7751r2d_setup,
         .mv_nr_irqs             = 72,
 
-        .mv_inb                 = rts7751r2d_inb,
-        .mv_inw                 = rts7751r2d_inw,
-        .mv_inl                 = rts7751r2d_inl,
-        .mv_outb                = rts7751r2d_outb,
-        .mv_outw                = rts7751r2d_outw,
-        .mv_outl                = rts7751r2d_outl,
-
-        .mv_inb_p               = rts7751r2d_inb_p,
-        .mv_inw_p               = rts7751r2d_inw,
-        .mv_inl_p               = rts7751r2d_inl,
-        .mv_outb_p              = rts7751r2d_outb_p,
-        .mv_outw_p              = rts7751r2d_outw,
-        .mv_outl_p              = rts7751r2d_outl,
-
-        .mv_insb                = rts7751r2d_insb,
-        .mv_insw                = rts7751r2d_insw,
-        .mv_insl                = rts7751r2d_insl,
-        .mv_outsb               = rts7751r2d_outsb,
-        .mv_outsw               = rts7751r2d_outsw,
-        .mv_outsl               = rts7751r2d_outsl,
-
         .mv_init_irq            = init_rts7751r2d_IRQ,
         .mv_irq_demux           = rts7751r2d_irq_demux,