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>

12 files changed, 395 insertions, 522 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))