From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 24 Jul 2011 15:18:29 +0000 (+0000)
Subject: brcm47xx: run ssb_pcicore_fix_sprom_core_index just for ssb bus on pci
X-Git-Tag: reboot~16182
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4815eaa4c33ef818dcd1fd5001b758f21b291674;p=openwrt%2Fstaging%2Fblogic.git

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
---

diff --git a/target/linux/brcm47xx/patches-3.0/230-ssb_pci_sprom.patch b/target/linux/brcm47xx/patches-3.0/230-ssb_pci_sprom.patch
new file mode 100644
index 000000000000..30f133bb56f1
--- /dev/null
+++ b/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) {