aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2014-11-08 20:51:24 +0000
committerRafał Miłecki <zajec5@gmail.com>2014-11-08 20:51:24 +0000
commitfcc8fe9bd2700cf1b893de6f790361fc6bf41ade (patch)
treeecee855fde9fa5b3daa0446caa7861375626c662
parent061f1bf326b299d1a1736f5012b362820c5bf242 (diff)
downloadupstream-fcc8fe9bd2700cf1b893de6f790361fc6bf41ade.tar.gz
upstream-fcc8fe9bd2700cf1b893de6f790361fc6bf41ade.tar.bz2
upstream-fcc8fe9bd2700cf1b893de6f790361fc6bf41ade.zip
kernel: ssb: add PCI ID 0x4351
Backports commit 9837baa99717c7526e4bae9c68e8728dea4af183 Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 43221
-rw-r--r--target/linux/generic/patches-3.10/020-ssb_update.patch10
-rw-r--r--target/linux/generic/patches-3.14/020-ssb_update.patch10
2 files changed, 20 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.10/020-ssb_update.patch b/target/linux/generic/patches-3.10/020-ssb_update.patch
index 354034ab48..6e93b9a91d 100644
--- a/target/linux/generic/patches-3.10/020-ssb_update.patch
+++ b/target/linux/generic/patches-3.10/020-ssb_update.patch
@@ -24,6 +24,16 @@
help
Driver to provide access to the GPIO pins on the bus.
+--- a/drivers/ssb/b43_pci_bridge.c
++++ b/drivers/ssb/b43_pci_bridge.c
+@@ -38,6 +38,7 @@ static const struct pci_device_id b43_pc
+ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432b) },
+ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432c) },
+ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4350) },
++ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4351) },
+ { 0, },
+ };
+ MODULE_DEVICE_TABLE(pci, b43_pci_bridge_tbl);
--- a/drivers/ssb/driver_chipcommon_sflash.c
+++ b/drivers/ssb/driver_chipcommon_sflash.c
@@ -9,6 +9,19 @@
diff --git a/target/linux/generic/patches-3.14/020-ssb_update.patch b/target/linux/generic/patches-3.14/020-ssb_update.patch
index 742460290a..8367b69fb6 100644
--- a/target/linux/generic/patches-3.14/020-ssb_update.patch
+++ b/target/linux/generic/patches-3.14/020-ssb_update.patch
@@ -1,3 +1,13 @@
+--- a/drivers/ssb/b43_pci_bridge.c
++++ b/drivers/ssb/b43_pci_bridge.c
+@@ -38,6 +38,7 @@ static const struct pci_device_id b43_pc
+ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432b) },
+ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432c) },
+ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4350) },
++ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4351) },
+ { 0, },
+ };
+ MODULE_DEVICE_TABLE(pci, b43_pci_bridge_tbl);
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -326,13 +326,13 @@ err_ctlreg: