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, 10 insertions, 84 deletions

diff --git a/arch/sh/drivers/pci/pci-sh7780.h b/arch/sh/drivers/pci/pci-sh7780.h
index 750d5d7753a2..f02d2180a4bc 100644
--- a/arch/sh/drivers/pci/pci-sh7780.h
+++ b/arch/sh/drivers/pci/pci-sh7780.h
@@ -12,28 +12,6 @@
 #ifndef _PCI_SH7780_H_
 #define _PCI_SH7780_H_
 
-#include <linux/pci.h>
-
-/* set debug level 4=verbose...1=terse */
-//#define DEBUG_PCI 3
-#undef DEBUG_PCI
-
-#ifdef DEBUG_PCI
-#define PCIDBG(n, x...) { if(DEBUG_PCI>=n) printk(x); }
-#else
-#define PCIDBG(n, x...)
-#endif
-
-/* startup values */
-#define PCI_PROBE_BIOS          1
-#define PCI_PROBE_CONF1         2
-#define PCI_PROBE_CONF2         4
-#define PCI_NO_SORT             0x100
-#define PCI_BIOS_SORT           0x200
-#define PCI_NO_CHECKS           0x400
-#define PCI_ASSIGN_ROMS         0x1000
-#define PCI_BIOS_IRQ_SCAN       0x2000
-
 /* Platform Specific Values */
 #define SH7780_VENDOR_ID        0x1912
 #define SH7780_DEVICE_ID        0x0002
@@ -47,15 +25,12 @@
 /* SH7780 Specific Values */
 #define SH7780_PCI_CONFIG_BASE  0xFD000000      /* Config space base addr */
 #define SH7780_PCI_CONFIG_SIZE  0x01000000      /* Config space size */
+
 #define SH7780_PCI_MEMORY_BASE  0xFD000000      /* Memory space base addr */
 #define SH7780_PCI_MEM_SIZE     0x01000000      /* Size of Memory window */
-#if 1
+
 #define SH7780_PCI_IO_BASE      0xFE400000      /* IO space base address */
 #define SH7780_PCI_IO_SIZE      0x00400000      /* Size of IO window */
-#else
-#define SH7780_PCI_IO_BASE      0xFE200000      /* IO space base address */
-#define SH7780_PCI_IO_SIZE      0x00200000      /* Size of IO window */
-#endif
 
 #define SH7780_PCIREG_BASE      0xFE040000      /* PCI regs base address */
 #define PCI_REG(n)              (SH7780_PCIREG_BASE+n)
@@ -90,44 +65,16 @@
 #define SH7780_PCIPMCSR_BSE     0x046
 #define SH7780_PCICDD           0x047
 
-/* SH7780 PCI Local Registers */
-#define SH7780_PCICR            0x100           /* PCI Control Register */
-  #define SH7780_PCICR_PREFIX   0xA5000000      /* CR prefix for write */
-  #define SH7780_PCICR_PFCS     0x00000800      /* TRDY/IRDY Enable */
-  #define SH7780_PCICR_FTO      0x00000400      /* TRDY/IRDY Enable */
-  #define SH7780_PCICR_PFE      0x00000200      /* Target Read Single */
-  #define SH7780_PCICR_TBS      0x00000100      /* Target Byte Swap */
-  #define SH7780_PCICR_ARBM     0x00000040      /* PCI Arbitration Mode */
-  #define SH7780_PCICR_IOCS     0x00000004      /* INTA output assert */
-  #define SH7780_PCICR_PRST     0x00000002      /* PCI Reset Assert */
-  #define SH7780_PCICR_CFIN     0x00000001      /* Central Fun. Init Done */
-#define SH7780_PCILSR0          0x104           /* PCI Local Space Register0 */
-#define SH7780_PCILSR1          0x108           /* PCI Local Space Register1 */
-#define SH7780_PCILAR0          0x10C   /* PCI Local Address Register1 */
-#define SH7780_PCILAR1          0x110   /* PCI Local Address Register1 */
-#define SH7780_PCIIR            0x114           /* PCI Interrupt Register */
-#define SH7780_PCIIMR           0x118   /* PCI Interrupt Mask Register */
-#define SH7780_PCIAIR           0x11C           /* Error Address Register */
-#define SH7780_PCICIR           0x120   /* Error Command/Data Register */
-#define SH7780_PCIAINT          0x130           /* Arbiter Interrupt Register */
-#define SH7780_PCIAINTM         0x134           /* Arbiter Int. Mask Register */
-#define SH7780_PCIBMIR          0x138           /* Error Bus Master Register */
-#define SH7780_PCIPAR           0x1C0           /* PIO Address Register */
-#define SH7780_PCIPINT          0x1CC   /* Power Management Int. Register */
-#define SH7780_PCIPINTM         0x1D0   /* Power Management Mask Register */
-#define SH7780_PCIMBR0          0x1E0           /* Memory Bank0 Register */
-#define SH7780_PCIMBMR0         0x1E4           /* Memory Bank0 Mask Register */
-#define SH7780_PCIMBR1          0x1E8           /* Memory Bank1  Register */
-#define SH7780_PCIMBMR1         0x1EC           /* Memory Bank1 Mask Register */
-#define SH7780_PCIMBR2          0x1F0           /* Memory Bank2 Register */
-#define SH7780_PCIMBMR2         0x1F4           /* Memory Bank2 Mask Register */
-#define SH7780_PCIIOBR          0x1F8           /* Bank Register */
-#define SH7780_PCIIOBMR         0x1FC           /* Bank Mask Register */
+#define SH7780_PCIMBR0          0x1E0
+#define SH7780_PCIMBMR0         0x1E4
+#define SH7780_PCIMBR2          0x1F0
+#define SH7780_PCIMBMR2         0x1F4
+#define SH7780_PCIIOBR          0x1F8
+#define SH7780_PCIIOBMR         0x1FC
 #define SH7780_PCICSCR0         0x210           /* Cache Snoop1 Cnt. Register */
 #define SH7780_PCICSCR1         0x214           /* Cache Snoop2 Cnt. Register */
 #define SH7780_PCICSAR0         0x218   /* Cache Snoop1 Addr. Register */
 #define SH7780_PCICSAR1         0x21C   /* Cache Snoop2 Addr. Register */
-#define SH7780_PCIPDR           0x220           /* Port IO Data Register */
 
 /* General Memory Config Addresses */
 #define SH7780_CS0_BASE_ADDR    0x0
@@ -139,30 +86,9 @@
 #define SH7780_CS5_BASE_ADDR    (SH7780_CS4_BASE_ADDR + SH7780_MEM_REGION_SIZE)
 #define SH7780_CS6_BASE_ADDR    (SH7780_CS5_BASE_ADDR + SH7780_MEM_REGION_SIZE)
 
-/* General PCI values */
-#define SH7780_PCI_HOST_BRIDGE  0x6
-
-/* Flags */
-#define SH7780_PCIC_NO_RESET    0x0001
-
-/* External functions defined per platform i.e. Big Sur, SE... (these could be routed
- * through the machine vectors... */
-extern int pcibios_init_platform(void);
-extern int pcibios_map_platform_irq(u8 slot, u8 pin);
-
-struct sh7780_pci_address_space {
-        unsigned long base;
-        unsigned long size;
-};
-
-struct sh7780_pci_address_map {
-        struct sh7780_pci_address_space window0;
-        struct sh7780_pci_address_space window1;
-        unsigned long flags;
-};
+struct sh4_pci_address_map;
 
 /* arch/sh/drivers/pci/pci-sh7780.c */
-extern int sh7780_pcic_init(struct sh7780_pci_address_map *map);
+int sh7780_pcic_init(struct sh4_pci_address_map *map);
 
 #endif /* _PCI_SH7780_H_ */
-