aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2011-07-24 15:18:29 +0000
committerHauke Mehrtens <hauke@openwrt.org>2011-07-24 15:18:29 +0000
commit2f8c8f0ca83ad7772fa2ac9c470678a975598bcc (patch)
tree1056de15c99ab29f99fb5a2aad82cdfd35156bfe /target/linux/brcm47xx
parent71156dadb8469559787af85bca4d4dd5aa19936d (diff)
downloadupstream-2f8c8f0ca83ad7772fa2ac9c470678a975598bcc.tar.gz
upstream-2f8c8f0ca83ad7772fa2ac9c470678a975598bcc.tar.bz2
upstream-2f8c8f0ca83ad7772fa2ac9c470678a975598bcc.zip
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. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27758 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx')
-rw-r--r--target/linux/brcm47xx/patches-3.0/230-ssb_pci_sprom.patch19
1 files changed, 19 insertions, 0 deletions
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 0000000000..30f133bb56
--- /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) {