brcm47xx: run ssb_pcicore_fix_sprom_core_index just for ssb bus on pci

ssb_pcicore_fix_sprom_core_index accesses the sprom on the pci bus but
this causes a data bus error (oops) on a SoC.

SVN-Revision: 27758
master
Hauke Mehrtens 13 years ago
parent 866a22dc67
commit 4815eaa4c3
  1. 19
      target/linux/brcm47xx/patches-3.0/230-ssb_pci_sprom.patch

@ -0,0 +1,19 @@
--- a/drivers/ssb/driver_pcicore.c
+++ b/drivers/ssb/driver_pcicore.c
@@ -516,10 +516,14 @@ static void ssb_pcicore_pcie_setup_worka
static void __devinit ssb_pcicore_init_clientmode(struct ssb_pcicore *pc)
{
- ssb_pcicore_fix_sprom_core_index(pc);
+ struct ssb_device *pdev = pc->dev;
+ struct ssb_bus *bus = pdev->bus;
+
+ if (bus->bustype == SSB_BUSTYPE_PCI)
+ ssb_pcicore_fix_sprom_core_index(pc);
/* Disable PCI interrupts. */
- ssb_write32(pc->dev, SSB_INTVEC, 0);
+ ssb_write32(pdev, SSB_INTVEC, 0);
/* Additional PCIe always once-executed workarounds */
if (pc->dev->id.coreid == SSB_DEV_PCIE) {
Loading…
Cancel
Save