summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-3.12
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-11-11 00:08:09 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-11-11 00:08:09 +0000
commitb4a01fc85436d64a056f8d767aeda1471dca8b0d (patch)
tree8d021bc8d27a3ffee852900bc1f85687bf367672 /target/linux/generic/patches-3.12
parent72b47e69c406227055e4bb942e0cb813ae615200 (diff)
downloadmtk-20170518-b4a01fc85436d64a056f8d767aeda1471dca8b0d.zip
mtk-20170518-b4a01fc85436d64a056f8d767aeda1471dca8b0d.tar.gz
mtk-20170518-b4a01fc85436d64a056f8d767aeda1471dca8b0d.tar.bz2
kernel: bcma: detect pci ID 0x4313
This pci ID is used by sprom less BCM4313 devices. This is a backport from the mainline kernel. This is part of #13551. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 38713
Diffstat (limited to 'target/linux/generic/patches-3.12')
-rw-r--r--target/linux/generic/patches-3.12/025-bcma_backport.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.12/025-bcma_backport.patch b/target/linux/generic/patches-3.12/025-bcma_backport.patch
new file mode 100644
index 0000000..9fc946c
--- /dev/null
+++ b/target/linux/generic/patches-3.12/025-bcma_backport.patch
@@ -0,0 +1,24 @@
+--- a/drivers/bcma/host_pci.c
++++ b/drivers/bcma/host_pci.c
+@@ -188,8 +188,11 @@ static int bcma_host_pci_probe(struct pc
+ pci_write_config_dword(dev, 0x40, val & 0xffff00ff);
+
+ /* SSB needed additional powering up, do we have any AMBA PCI cards? */
+- if (!pci_is_pcie(dev))
+- bcma_err(bus, "PCI card detected, report problems.\n");
++ if (!pci_is_pcie(dev)) {
++ bcma_err(bus, "PCI card detected, they are not supported.\n");
++ err = -ENXIO;
++ goto err_pci_release_regions;
++ }
+
+ /* Map MMIO */
+ err = -ENOMEM;
+@@ -269,6 +272,7 @@ static SIMPLE_DEV_PM_OPS(bcma_pm_ops, bc
+
+ static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {
+ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },
++ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4313) },
+ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43224) },
+ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },
+ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) },