sh: pci: Start unifying the SH7780 PCIC initialization.

This starts moving out the common initialization bits from the various
fixup paths in to the shared init path.

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

1 files changed, 1 insertions, 19 deletions

diff --git a/arch/sh/drivers/pci/fixups-r7780rp.c b/arch/sh/drivers/pci/fixups-r7780rp.c
index 864e92f69702..15ca65cb667e 100644
--- a/arch/sh/drivers/pci/fixups-r7780rp.c
+++ b/arch/sh/drivers/pci/fixups-r7780rp.c
@@ -22,33 +22,15 @@ int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
 {
         return irq_tab[slot];
 }
+
 int pci_fixup_pcic(struct pci_channel *chan)
 {
         pci_write_reg(chan, 0x000043ff, SH4_PCIINTM);
-        pci_write_reg(chan, 0x0000380f, SH4_PCIAINTM);
-
-        pci_write_reg(chan, 0xfbb00047, SH7780_PCICMD);
         pci_write_reg(chan, 0x00000000, SH7780_PCIIBAR);
-
-        pci_write_reg(chan, 0x00011912, SH7780_PCISVID);
         pci_write_reg(chan, 0x08000000, SH7780_PCICSCR0);
         pci_write_reg(chan, 0x0000001b, SH7780_PCICSAR0);
         pci_write_reg(chan, 0xfd000000, SH7780_PCICSCR1);
         pci_write_reg(chan, 0x0000000f, SH7780_PCICSAR1);
 
-        pci_write_reg(chan, 0xfd000000, SH7780_PCIMBR0);
-        pci_write_reg(chan, 0x00fc0000, SH7780_PCIMBMR0);
-
-#ifdef CONFIG_32BIT
-        pci_write_reg(chan, 0xc0000000, SH7780_PCIMBR2);
-        pci_write_reg(chan, 0x20000000 - SH7780_PCI_IO_SIZE, SH7780_PCIMBMR2);
-#endif
-
-        /* Set IOBR for windows containing area specified in pci.h */
-        pci_write_reg(chan, chan->io_resource->start & ~(SH7780_PCI_IO_SIZE-1),
-                      SH7780_PCIIOBR);
-        pci_write_reg(chan, ((SH7780_PCI_IO_SIZE-1) & (7<<18)),
-                      SH7780_PCIIOBMR);
-
         return 0;
 }