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.13 | |
| 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.13')
| -rw-r--r-- | target/linux/generic/patches-3.13/025-bcma_backport.patch | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/target/linux/generic/patches-3.13/025-bcma_backport.patch b/target/linux/generic/patches-3.13/025-bcma_backport.patch index 301a97c558..e5c7e75296 100644 --- a/target/linux/generic/patches-3.13/025-bcma_backport.patch +++ b/target/linux/generic/patches-3.13/025-bcma_backport.patch @@ -31,10 +31,11 @@ int bcma_bus_scan(struct bcma_bus *bus); --- a/drivers/bcma/driver_chipcommon_pmu.c +++ b/drivers/bcma/driver_chipcommon_pmu.c -@@ -603,6 +603,7 @@ void bcma_pmu_spuravoid_pllupdate(struct +@@ -603,6 +603,8 @@ void bcma_pmu_spuravoid_pllupdate(struct tmp = BCMA_CC_PMU_CTL_PLL_UPD | BCMA_CC_PMU_CTL_NOILPONW; break; ++ case BCMA_CHIP_ID_BCM43131: + case BCMA_CHIP_ID_BCM43217: case BCMA_CHIP_ID_BCM43227: case BCMA_CHIP_ID_BCM43228: @@ -458,11 +459,12 @@ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4313) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43224) }, -@@ -280,6 +279,7 @@ static DEFINE_PCI_DEVICE_TABLE(bcma_pci_ +@@ -280,6 +279,8 @@ static DEFINE_PCI_DEVICE_TABLE(bcma_pci_ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4358) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4359) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4365) }, + { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a9) }, ++ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43aa) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) }, { 0, }, }; @@ -582,10 +584,11 @@ SPEX(leddc_on_time, SSB_SPROM8_LEDDC, SSB_SPROM8_LEDDC_ON, SSB_SPROM8_LEDDC_ON_SHIFT); -@@ -509,6 +534,7 @@ static bool bcma_sprom_onchip_available( +@@ -509,6 +534,8 @@ static bool bcma_sprom_onchip_available( /* for these chips OTP is always available */ present = true; break; ++ case BCMA_CHIP_ID_BCM43131: + case BCMA_CHIP_ID_BCM43217: case BCMA_CHIP_ID_BCM43227: case BCMA_CHIP_ID_BCM43228: @@ -600,16 +603,17 @@ #include <linux/bcma/bcma_driver_mips.h> #include <linux/bcma/bcma_driver_gmac_cmn.h> #include <linux/ssb/ssb.h> /* SPROM sharing */ -@@ -157,6 +158,8 @@ struct bcma_host_ops { +@@ -157,6 +158,9 @@ struct bcma_host_ops { /* 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 -@@ -333,6 +336,7 @@ struct bcma_bus { +@@ -333,6 +337,7 @@ struct bcma_bus { struct bcma_drv_cc drv_cc; struct bcma_drv_pci drv_pci[2]; @@ -617,7 +621,7 @@ struct bcma_drv_mips drv_mips; struct bcma_drv_gmac_cmn drv_gmac_cmn; -@@ -418,7 +422,14 @@ static inline void bcma_maskset16(struct +@@ -418,7 +423,14 @@ static inline void bcma_maskset16(struct bcma_write16(cc, offset, (bcma_read16(cc, offset) & mask) | set); } |