diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-07-30 18:54:10 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-07-30 18:54:10 +0000 |
commit | b1df24f00eef530cfa587c49907cb70de7cb5517 (patch) | |
tree | 7c01423372556d10d3314846cc8199ace01239e6 /target/linux/generic/patches-3.3 | |
parent | f548b18353bc31ecd2a8ecf44470c31676acbd86 (diff) | |
download | master-31e0f0ae-b1df24f00eef530cfa587c49907cb70de7cb5517.tar.gz master-31e0f0ae-b1df24f00eef530cfa587c49907cb70de7cb5517.tar.bz2 master-31e0f0ae-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.3')
-rw-r--r-- | target/linux/generic/patches-3.3/025-bcma_backport.patch | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/target/linux/generic/patches-3.3/025-bcma_backport.patch b/target/linux/generic/patches-3.3/025-bcma_backport.patch index 79f0b59021..df80ec435b 100644 --- a/target/linux/generic/patches-3.3/025-bcma_backport.patch +++ b/target/linux/generic/patches-3.3/025-bcma_backport.patch @@ -4717,7 +4717,7 @@ #define BCMA_CORE_INVALID 0x700 #define BCMA_CORE_CHIPCOMMON 0x800 #define BCMA_CORE_ILINE20 0x801 -@@ -121,10 +146,109 @@ struct bcma_host_ops { +@@ -121,10 +146,112 @@ 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 */ @@ -4732,6 +4732,9 @@ +/* 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 @@ -4827,7 +4830,7 @@ struct bcma_device { struct bcma_bus *bus; struct bcma_device_id id; -@@ -136,8 +260,10 @@ struct bcma_device { +@@ -136,8 +263,10 @@ struct bcma_device { bool dev_registered; u8 core_index; @@ -4838,7 +4841,7 @@ u32 wrap; void __iomem *io_addr; -@@ -175,6 +301,12 @@ int __bcma_driver_register(struct bcma_d +@@ -175,6 +304,12 @@ int __bcma_driver_register(struct bcma_d extern void bcma_driver_unregister(struct bcma_driver *drv); @@ -4851,7 +4854,7 @@ struct bcma_bus { /* The MMIO area. */ void __iomem *mmio; -@@ -191,14 +323,18 @@ struct bcma_bus { +@@ -191,14 +326,18 @@ struct bcma_bus { struct bcma_chipinfo chipinfo; @@ -4871,7 +4874,7 @@ /* We decided to share SPROM struct with SSB as long as we do not need * any hacks for BCMA. This simplifies drivers code. */ -@@ -282,6 +418,7 @@ static inline void bcma_maskset16(struct +@@ -282,6 +421,7 @@ static inline void bcma_maskset16(struct bcma_write16(cc, offset, (bcma_read16(cc, offset) & mask) | set); } @@ -4879,7 +4882,7 @@ extern bool bcma_core_is_enabled(struct bcma_device *core); extern void bcma_core_disable(struct bcma_device *core, u32 flags); extern int bcma_core_enable(struct bcma_device *core, u32 flags); -@@ -289,6 +426,7 @@ extern void bcma_core_set_clockmode(stru +@@ -289,6 +429,7 @@ extern void bcma_core_set_clockmode(stru enum bcma_clkmode clkmode); extern void bcma_core_pll_ctl(struct bcma_device *core, u32 req, u32 status, bool on); |