aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.9
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-07-30 18:54:10 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-07-30 18:54:10 +0000
commitb1df24f00eef530cfa587c49907cb70de7cb5517 (patch)
tree7c01423372556d10d3314846cc8199ace01239e6 /target/linux/generic/patches-3.9
parentf548b18353bc31ecd2a8ecf44470c31676acbd86 (diff)
downloadupstream-b1df24f00eef530cfa587c49907cb70de7cb5517.tar.gz
upstream-b1df24f00eef530cfa587c49907cb70de7cb5517.tar.bz2
upstream-b1df24f00eef530cfa587c49907cb70de7cb5517.zip
kernel: update bcma to version master-2014-07-29-1
This is a backport of bcma from wireless-tesing/master tag master-2014-07-29-1. For kernel < 3.10 this only adds the header changes needed by more recent b43 versions. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 41899
Diffstat (limited to 'target/linux/generic/patches-3.9')
-rw-r--r--target/linux/generic/patches-3.9/025-bcma_backport.patch7
1 files changed, 5 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.9/025-bcma_backport.patch b/target/linux/generic/patches-3.9/025-bcma_backport.patch
index 92b1a328e6..9a40d6ec84 100644
--- a/target/linux/generic/patches-3.9/025-bcma_backport.patch
+++ b/target/linux/generic/patches-3.9/025-bcma_backport.patch
@@ -843,7 +843,7 @@
#define BCMA_CORE_4706_MAC_GBIT 0x52D
#define BCMA_CORE_AMEMC 0x52E /* DDR1/2 memory controller core */
#define BCMA_CORE_ALTA 0x534 /* I2S core */
-@@ -134,12 +146,17 @@ struct bcma_host_ops {
+@@ -134,12 +146,20 @@ struct bcma_host_ops {
#define BCMA_CORE_I2S 0x834
#define BCMA_CORE_SDR_DDR1_MEM_CTL 0x835 /* SDR/DDR1 memory controller core */
#define BCMA_CORE_SHIM 0x837 /* SHIM component in ubus/6362 */
@@ -858,10 +858,13 @@
/* Chip IDs of PCIe devices */
#define BCMA_CHIP_ID_BCM4313 0x4313
+#define BCMA_CHIP_ID_BCM43142 43142
++#define BCMA_CHIP_ID_BCM43131 43131
++#define BCMA_CHIP_ID_BCM43217 43217
++#define BCMA_CHIP_ID_BCM43222 43222
#define BCMA_CHIP_ID_BCM43224 43224
#define BCMA_PKG_ID_BCM43224_FAB_CSM 0x8
#define BCMA_PKG_ID_BCM43224_FAB_SMIC 0xa
-@@ -172,6 +189,65 @@ struct bcma_host_ops {
+@@ -172,6 +192,65 @@ struct bcma_host_ops {
#define BCMA_PKG_ID_BCM5357 11
#define BCMA_CHIP_ID_BCM53572 53572
#define BCMA_PKG_ID_BCM47188 9