sh: pci: Set class/sub-class code correctly for SH7780 PCIC.

The SH7780 PCI host controller implements a configuration header that
requires a fair bit of hand-holding to initialize properly. By default
it appears as a pre-2.0 host controller given the zeroed out class code,
so fix this up properly.

Some boards that happened to be using the R7780RP version of the PCIC
fixups had set this correctly, but this belongs in the standard
initialization, and is by no means board specific.

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

diff --git a/arch/sh/drivers/pci/fixups-sdk7780.c b/arch/sh/drivers/pci/fixups-sdk7780.c
index c2957312b30bd38e52d16b76689d17d946ee8d28..004efd486ee356953ba95d97306091ea6eb30d09 100644 (file)
--- a/arch/sh/drivers/pci/fixups-sdk7780.c
+++ b/arch/sh/drivers/pci/fixups-sdk7780.c
@@ -16,8 +16,6 @@
 
 int pci_fixup_pcic(struct pci_channel *chan)
 {
-       ctrl_outl(0x00000001, SH7780_PCI_VCR2);
-
        /* Enable all interrupts, so we know what to fix */
        pci_write_reg(chan, 0x0000C3FF, SH7780_PCIIMR);
        pci_write_reg(chan, 0x0000380F, SH7780_PCIAINTM);
@@ -26,8 +24,6 @@ int pci_fixup_pcic(struct pci_channel *chan)
        pci_write_reg(chan, 0xFB00, SH7780_PCISTATUS);
        pci_write_reg(chan, 0x0047, SH7780_PCICMD);
        pci_write_reg(chan, 0x00, SH7780_PCIPIF);
-       pci_write_reg(chan, 0x00, SH7780_PCISUB);
-       pci_write_reg(chan, 0x06, SH7780_PCIBCC);
        pci_write_reg(chan, 0x1912, SH7780_PCISVID);
        pci_write_reg(chan, 0x0001, SH7780_PCISID);
 

diff --git a/arch/sh/drivers/pci/pci-sh7780.c b/arch/sh/drivers/pci/pci-sh7780.c
index 45fa423f2e53dd3a3b0e2d39e079d791d44b1a88..7f4f590375443b01c774cf4234f1ecfb5c1fb0a0 100644 (file)
--- a/arch/sh/drivers/pci/pci-sh7780.c
+++ b/arch/sh/drivers/pci/pci-sh7780.c
@@ -72,16 +72,15 @@ int __init sh7780_pcic_init(struct pci_channel *chan,
 {
        u32 word;
 
+       pci_write_reg(chan, PCI_CLASS_BRIDGE_HOST >> 8, SH7780_PCIBCC);
+       pci_write_reg(chan, PCI_CLASS_BRIDGE_HOST & 0xff, SH7780_PCISUB);
+
        /* set the command/status bits to:
         * Wait Cycle Control + Parity Enable + Bus Master +
         * Mem space enable
         */
        pci_write_reg(chan, 0x00000046, SH7780_PCICMD);
 
-       /* define this host as the host bridge */
-       word = PCI_BASE_CLASS_BRIDGE << 24;
-       pci_write_reg(chan, word, SH7780_PCIRID);
-
        /* Set IO and Mem windows to local address
         * Make PCI and local address the same for easy 1 to 1 mapping
         */