sh: Consolidated SH7751/SH7780 PCI support.

This cleans up quite a lot of the PCI mess that we
currently have, and attempts to consolidate the
duplication in the SH7780 and SH7751 PCI controllers.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 38 insertions, 78 deletions

diff --git a/arch/sh/boards/renesas/hs7751rvoip/io.c b/arch/sh/boards/renesas/hs7751rvoip/io.c
index ecdce7ef6a3..8c26550ca2e 100644
--- a/arch/sh/boards/renesas/hs7751rvoip/io.c
+++ b/arch/sh/boards/renesas/hs7751rvoip/io.c
@@ -13,14 +13,11 @@
 
 #include <linux/kernel.h>
 #include <linux/types.h>
+#include <linux/module.h>
 #include <asm/io.h>
 #include <asm/hs7751rvoip/hs7751rvoip.h>
 #include <asm/addrspace.h>
 
-#include <linux/module.h>
-#include <linux/pci.h>
-#include "../../../drivers/pci/pci-sh7751.h"
-
 extern void *area6_io8_base;	/* Area 6 8bit I/O Base address */
 extern void *area5_io16_base;	/* Area 5 16bit I/O Base address */
 
@@ -31,27 +28,17 @@ extern void *area5_io16_base;	/* Area 5 16bit I/O Base address */
  * like the other Solution Engine boards.
  */
 
-#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 CODEC_IO_BASE	0x1000
 #define CODEC_IOMAP(a)	((unsigned long)area6_io8_base + ((a) - CODEC_IO_BASE))
 
-static inline void delay(void)
-{
-	ctrl_inw(0xa0000000);
-}
-
 static inline unsigned long port2adr(unsigned int port)
 {
 	if ((0x1f0 <= port && port < 0x1f8) || port == 0x3f6)
 		if (port == 0x3f6)
 			return ((unsigned long)area5_io16_base + 0x0c);
 		else
-			return ((unsigned long)area5_io16_base + 0x800 + ((port-0x1f0) << 1));
+			return ((unsigned long)area5_io16_base + 0x800 +
+				((port-0x1f0) << 1));
 	else
 		maybebadio((unsigned long)port);
 	return port;
@@ -70,25 +57,10 @@ static inline int shifted_port(unsigned long port)
 }
 
 #if defined(CONFIG_HS7751RVOIP_CODEC)
-static inline int
-codec_port(unsigned long port)
-{
-	if (CODEC_IO_BASE <= port && port < (CODEC_IO_BASE+0x20))
-		return 1;
-	else
-		return 0;
-}
-#endif
-
-/* 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)))
+#define codec_port(port)	\
+	((CODEC_IO_BASE <= (port)) && ((port) < (CODEC_IO_BASE + 0x20)))
 #else
-#define CHECK_SH7751_PCIIO(port) (0)
+#define codec_port(port)	(0)
 #endif
 
 /*
@@ -102,12 +74,10 @@ unsigned char hs7751rvoip_inb(unsigned long port)
 {
 	if (PXSEG(port))
 		return ctrl_inb(port);
-#if defined(CONFIG_HS7751RVOIP_CODEC)
 	else if (codec_port(port))
 		return ctrl_inb(CODEC_IOMAP(port));
-#endif
-	else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-		return ctrl_inb(PCI_IOMAP(port));
+	else if (is_pci_ioaddr(port) || shifted_port(port))
+		return ctrl_inb(pci_ioaddr(port));
 	else
 		return ctrl_inw(port2adr(port)) & 0xff;
 }
@@ -118,15 +88,13 @@ unsigned char hs7751rvoip_inb_p(unsigned long port)
 
         if (PXSEG(port))
 		v = ctrl_inb(port);
-#if defined(CONFIG_HS7751RVOIP_CODEC)
 	else if (codec_port(port))
 		v = ctrl_inb(CODEC_IOMAP(port));
-#endif
-	else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-		v = ctrl_inb(PCI_IOMAP(port));
+	else if (is_pci_ioaddr(port) || shifted_port(port))
+		v = ctrl_inb(pci_ioaddr(port));
 	else
 		v = ctrl_inw(port2adr(port)) & 0xff;
-	delay();
+	ctrl_delay();
 	return v;
 }
 
@@ -134,8 +102,8 @@ unsigned short hs7751rvoip_inw(unsigned long port)
 {
         if (PXSEG(port))
 		return ctrl_inw(port);
-	else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-		return ctrl_inw(PCI_IOMAP(port));
+	else if (is_pci_ioaddr(port) || shifted_port(port))
+		return ctrl_inw(pci_ioaddr(port));
 	else
 		maybebadio(port);
 	return 0;
@@ -145,8 +113,8 @@ unsigned int hs7751rvoip_inl(unsigned long port)
 {
         if (PXSEG(port))
 		return ctrl_inl(port);
-	else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-		return ctrl_inl(PCI_IOMAP(port));
+	else if (is_pci_ioaddr(port) || shifted_port(port))
+		return ctrl_inl(pci_ioaddr(port));
 	else
 		maybebadio(port);
 	return 0;
@@ -157,12 +125,10 @@ void hs7751rvoip_outb(unsigned char value, unsigned long port)
 
         if (PXSEG(port))
 		ctrl_outb(value, port);
-#if defined(CONFIG_HS7751RVOIP_CODEC)
 	else if (codec_port(port))
 		ctrl_outb(value, CODEC_IOMAP(port));
-#endif
-	else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-		ctrl_outb(value, PCI_IOMAP(port));
+	else if (is_pci_ioaddr(port) || shifted_port(port))
+		ctrl_outb(value, pci_ioaddr(port));
 	else
 		ctrl_outb(value, port2adr(port));
 }
@@ -171,24 +137,22 @@ void hs7751rvoip_outb_p(unsigned char value, unsigned long port)
 {
         if (PXSEG(port))
 		ctrl_outb(value, port);
-#if defined(CONFIG_HS7751RVOIP_CODEC)
 	else if (codec_port(port))
 		ctrl_outb(value, CODEC_IOMAP(port));
-#endif
-	else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-		ctrl_outb(value, PCI_IOMAP(port));
+	else if (is_pci_ioaddr(port) || shifted_port(port))
+		ctrl_outb(value, pci_ioaddr(port));
 	else
 		ctrl_outw(value, port2adr(port));
 
-	delay();
+	ctrl_delay();
 }
 
 void hs7751rvoip_outw(unsigned short value, unsigned long port)
 {
         if (PXSEG(port))
 		ctrl_outw(value, port);
-	else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-		ctrl_outw(value, PCI_IOMAP(port));
+	else if (is_pci_ioaddr(port) || shifted_port(port))
+		ctrl_outw(value, pci_ioaddr(port));
 	else
 		maybebadio(port);
 }
@@ -197,8 +161,8 @@ void hs7751rvoip_outl(unsigned int value, unsigned long port)
 {
         if (PXSEG(port))
 		ctrl_outl(value, port);
-	else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-		ctrl_outl(value, PCI_IOMAP(port));
+	else if (is_pci_ioaddr(port) || shifted_port(port))
+		ctrl_outl(value, pci_ioaddr(port));
 	else
 		maybebadio(port);
 }
@@ -210,13 +174,11 @@ void hs7751rvoip_insb(unsigned long port, void *addr, unsigned long count)
 	if (PXSEG(port))
 		while (count--)
 			*buf++ = ctrl_inb(port);
-#if defined(CONFIG_HS7751RVOIP_CODEC)
 	else if (codec_port(port))
 		while (count--)
 			*buf++ = ctrl_inb(CODEC_IOMAP(port));
-#endif
-	else if (CHECK_SH7751_PCIIO(port) || shifted_port(port)) {
-		volatile u8 *bp = (volatile u8 *)PCI_IOMAP(port);
+	else if (is_pci_ioaddr(port) || shifted_port(port)) {
+		volatile u8 *bp = (volatile u8 *)pci_ioaddr(port);
 
 		while (count--)
 			*buf++ = *bp;
@@ -235,8 +197,8 @@ void hs7751rvoip_insw(unsigned long port, void *addr, unsigned long count)
 
 	if (PXSEG(port))
 		p = (volatile u16 *)port;
-	else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-		p = (volatile u16 *)PCI_IOMAP(port);
+	else if (is_pci_ioaddr(port) || shifted_port(port))
+		p = (volatile u16 *)pci_ioaddr(port);
 	else
 		p = (volatile u16 *)port2adr(port);
 	while (count--)
@@ -246,8 +208,8 @@ void hs7751rvoip_insw(unsigned long port, void *addr, unsigned long count)
 void hs7751rvoip_insl(unsigned long port, void *addr, unsigned long count)
 {
 
-	if (CHECK_SH7751_PCIIO(port) || shifted_port(port)) {
-		volatile u32 *p = (volatile u32 *)PCI_IOMAP(port);
+	if (is_pci_ioaddr(port) || shifted_port(port)) {
+		volatile u32 *p = (volatile u32 *)pci_ioaddr(port);
 		u32 *buf = addr;
 
 		while (count--)
@@ -263,13 +225,11 @@ void hs7751rvoip_outsb(unsigned long port, const void *addr, unsigned long count
 	if (PXSEG(port))
 		while (count--)
 			ctrl_outb(*buf++, port);
-#if defined(CONFIG_HS7751RVOIP_CODEC)
 	else if (codec_port(port))
 		while (count--)
 			ctrl_outb(*buf++, CODEC_IOMAP(port));
-#endif
-	else if (CHECK_SH7751_PCIIO(port) || shifted_port(port)) {
-		volatile u8 *bp = (volatile u8 *)PCI_IOMAP(port);
+	else if (is_pci_ioaddr(port) || shifted_port(port)) {
+		volatile u8 *bp = (volatile u8 *)pci_ioaddr(port);
 
 		while (count--)
 			*bp = *buf++;
@@ -288,8 +248,8 @@ void hs7751rvoip_outsw(unsigned long port, const void *addr, unsigned long count
 
 	if (PXSEG(port))
 		p = (volatile u16 *)port;
-	else if (CHECK_SH7751_PCIIO(port) || shifted_port(port))
-		p = (volatile u16 *)PCI_IOMAP(port);
+	else if (is_pci_ioaddr(port) || shifted_port(port))
+		p = (volatile u16 *)pci_ioaddr(port);
 	else
 		p = (volatile u16 *)port2adr(port);
 
@@ -301,8 +261,8 @@ void hs7751rvoip_outsl(unsigned long port, const void *addr, unsigned long count
 {
 	const u32 *buf = addr;
 
-	if (CHECK_SH7751_PCIIO(port) || shifted_port(port)) {
-		volatile u32 *p = (volatile u32 *)PCI_IOMAP(port);
+	if (is_pci_ioaddr(port) || shifted_port(port)) {
+		volatile u32 *p = (volatile u32 *)pci_ioaddr(port);
 
 		while (count--)
 			*p = *buf++;
@@ -316,8 +276,8 @@ void __iomem *hs7751rvoip_ioport_map(unsigned long port, unsigned int size)
                 return (void __iomem *)port;
 	else if (unlikely(codec_port(port) && (size == 1)))
 		return (void __iomem *)CODEC_IOMAP(port);
-        else if (CHECK_SH7751_PCIIO(port))
-                return (void __iomem *)PCI_IOMAP(port);
+        else if (is_pci_ioaddr(port))
+                return (void __iomem *)pci_ioaddr(port);
 
         return (void __iomem *)port2adr(port);
 }