1 files changed, 28 insertions, 117 deletions

diff --git a/arch/sh/boards/snapgear/io.c b/arch/sh/boards/snapgear/io.c
index e2eb78fc381d..0f4824264557 100644
--- a/arch/sh/boards/snapgear/io.c
+++ b/arch/sh/boards/snapgear/io.c
@@ -1,6 +1,4 @@
-/* 
- * linux/arch/sh/kernel/io_7751se.c
- *
+/*
  * Copyright (C) 2002  David McCullough <davidm@snapgear.com>
  * Copyright (C) 2001  Ian da Silva, Jeremy Siegel
  * Based largely on io_se.c.
@@ -11,67 +9,22 @@
  * placeholder code from io_se.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 <asm/io.h>
 #include <asm/addrspace.h>
 
-#include <asm/pci.h>
-#include "../../drivers/pci/pci-sh7751.h"
-
 #ifdef CONFIG_SH_SECUREEDGE5410
 unsigned short secureedge5410_ioport;
 #endif
 
-/*
- * The SnapGear uses the built-in PCI controller (PCIC)
- * of the 7751 processor
- */ 
-
-#define PCIIOBR         (volatile long *)PCI_REG(SH7751_PCIIOBR)
-#define PCIMBR          (volatile long *)PCI_REG(SH7751_PCIMBR)
-#define PCI_IO_AREA     SH7751_PCI_IO_BASE
-#define PCI_MEM_AREA    SH7751_PCI_CONFIG_BASE
-
-
-#define PCI_IOMAP(adr)  (PCI_IO_AREA + (adr & ~SH7751_PCIIOBR_MASK))
-
-
-#define maybebadio(name,port) \
-  printk("bad PC-like io %s for port 0x%lx at 0x%08x\n", \
-         #name, (port), (__u32) __builtin_return_address(0))
-
-
-static inline void delay(void)
-{
-        ctrl_inw(0xa0000000);
-}
-
-
 static inline volatile __u16 *port2adr(unsigned int port)
 {
-#if 0
-        if (port >= 0x2000)
-                return (volatile __u16 *) (PA_MRSHPC + (port - 0x2000));
-#endif
-        maybebadio(name,(unsigned long)port);
+        maybebadio((unsigned long)port);
         return (volatile __u16*)port;
 }
 
-
-/* In case someone configures the kernel w/o PCI support: in that */
-/* scenario, don't ever bother to check for PCI-window addresses */
-
-/* NOTE: WINDOW CHECK MAY BE A BIT OFF, HIGH PCIBIOS_MIN_IO WRAPS? */
-#if defined(CONFIG_PCI)
-#define CHECK_SH7751_PCIIO(port) \
-  ((port >= PCIBIOS_MIN_IO) && (port < (PCIBIOS_MIN_IO + SH7751_PCI_IO_SIZE)))
-#else
-#define CHECK_SH7751_PCIIO(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)
@@ -79,148 +32,106 @@ static inline volatile __u16 *port2adr(unsigned int port)
  * should be way beyond the window, and is used  w/o translation for
  * compatibility.
  */
-
 unsigned char snapgear_inb(unsigned long port)
 {
         if (PXSEG(port))
                 return *(volatile unsigned char *)port;
-        else if (CHECK_SH7751_PCIIO(port))
-                return *(volatile unsigned char *)PCI_IOMAP(port);
+        else if (is_pci_ioaddr(port))
+                return *(volatile unsigned char *)pci_ioaddr(port);
         else
-                return (*port2adr(port))&0xff; 
+                return (*port2adr(port)) & 0xff;
 }
 
-
 unsigned char snapgear_inb_p(unsigned long port)
 {
         unsigned char v;
 
         if (PXSEG(port))
                 v = *(volatile unsigned char *)port;
-        else if (CHECK_SH7751_PCIIO(port))
-                v = *(volatile unsigned char *)PCI_IOMAP(port);
+        else if (is_pci_ioaddr(port))
+                v = *(volatile unsigned char *)pci_ioaddr(port);
         else
-                v = (*port2adr(port))&0xff; 
-        delay();
+                v = (*port2adr(port))&0xff;
+        ctrl_delay();
         return v;
 }
 
-
 unsigned short snapgear_inw(unsigned long port)
 {
         if (PXSEG(port))
                 return *(volatile unsigned short *)port;
-        else if (CHECK_SH7751_PCIIO(port))
-                return *(volatile unsigned short *)PCI_IOMAP(port);
+        else if (is_pci_ioaddr(port))
+                return *(volatile unsigned short *)pci_ioaddr(port);
         else if (port >= 0x2000)
                 return *port2adr(port);
         else
-                maybebadio(inw, port);
+                maybebadio(port);
         return 0;
 }
 
-
 unsigned int snapgear_inl(unsigned long port)
 {
         if (PXSEG(port))
                 return *(volatile unsigned long *)port;
-        else if (CHECK_SH7751_PCIIO(port))
-                return *(volatile unsigned int *)PCI_IOMAP(port);
+        else if (is_pci_ioaddr(port))
+                return *(volatile unsigned int *)pci_ioaddr(port);
         else if (port >= 0x2000)
                 return *port2adr(port);
         else
-                maybebadio(inl, port);
+                maybebadio(port);
         return 0;
 }
 
-
 void snapgear_outb(unsigned char value, unsigned long port)
 {
 
         if (PXSEG(port))
                 *(volatile unsigned char *)port = value;
-        else if (CHECK_SH7751_PCIIO(port))
-                *((unsigned char*)PCI_IOMAP(port)) = value;
+        else if (is_pci_ioaddr(port))
+                *((unsigned char*)pci_ioaddr(port)) = value;
         else
                 *(port2adr(port)) = value;
 }
 
-
 void snapgear_outb_p(unsigned char value, unsigned long port)
 {
         if (PXSEG(port))
                 *(volatile unsigned char *)port = value;
-        else if (CHECK_SH7751_PCIIO(port))
-                *((unsigned char*)PCI_IOMAP(port)) = value;
+        else if (is_pci_ioaddr(port))
+                *((unsigned char*)pci_ioaddr(port)) = value;
         else
                 *(port2adr(port)) = value;
-        delay();
+        ctrl_delay();
 }
 
-
 void snapgear_outw(unsigned short value, unsigned long port)
 {
         if (PXSEG(port))
                 *(volatile unsigned short *)port = value;
-        else if (CHECK_SH7751_PCIIO(port))
-                *((unsigned short *)PCI_IOMAP(port)) = value;
+        else if (is_pci_ioaddr(port))
+                *((unsigned short *)pci_ioaddr(port)) = value;
         else if (port >= 0x2000)
                 *port2adr(port) = value;
         else
-                maybebadio(outw, port);
+                maybebadio(port);
 }
 
-
 void snapgear_outl(unsigned int value, unsigned long port)
 {
         if (PXSEG(port))
                 *(volatile unsigned long *)port = value;
-        else if (CHECK_SH7751_PCIIO(port))
-                *((unsigned long*)PCI_IOMAP(port)) = value;
+        else if (is_pci_ioaddr(port))
+                *((unsigned long*)pci_ioaddr(port)) = value;
         else
-                maybebadio(outl, port);
+                maybebadio(port);
 }
 
 void snapgear_insl(unsigned long port, void *addr, unsigned long count)
 {
-        maybebadio(insl, port);
+        maybebadio(port);
 }
 
 void snapgear_outsl(unsigned long port, const void *addr, unsigned long count)
 {
-        maybebadio(outsw, port);
-}
-
-/* Map ISA bus address to the real address. Only for PCMCIA.  */
-
-
-/* ISA page descriptor.  */
-static __u32 sh_isa_memmap[256];
-
-
-#if 0
-static int sh_isa_mmap(__u32 start, __u32 length, __u32 offset)
-{
-        int idx;
-
-        if (start >= 0x100000 || (start & 0xfff) || (length != 0x1000))
-                return -1;
-
-        idx = start >> 12;
-        sh_isa_memmap[idx] = 0xb8000000 + (offset &~ 0xfff);
-#if 0
-        printk("sh_isa_mmap: start %x len %x offset %x (idx %x paddr %x)\n",
-               start, length, offset, idx, sh_isa_memmap[idx]);
-#endif
-        return 0;
-}
-#endif
-
-unsigned long snapgear_isa_port2addr(unsigned long offset)
-{
-        int idx;
-
-        idx = (offset >> 12) & 0xff;
-        offset &= 0xfff;
-        return sh_isa_memmap[idx] + offset;
+        maybebadio(port);
 }