aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2016-01-22 09:22:37 +0000
committerRafał Miłecki <zajec5@gmail.com>2016-01-22 09:22:37 +0000
commit529d527e2c0b7016a5b3707531f3ac17bbc65af5 (patch)
tree851753d3bdb82ffee146359ec352d252fe0e1d09 /package
parentbaa618790ad359e99396a233d85e9ef1e5c917ca (diff)
downloadupstream-529d527e2c0b7016a5b3707531f3ac17bbc65af5.tar.gz
upstream-529d527e2c0b7016a5b3707531f3ac17bbc65af5.tar.bz2
upstream-529d527e2c0b7016a5b3707531f3ac17bbc65af5.zip
kernel: backport bcma stuff sent for 4.6
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 48449
Diffstat (limited to 'package')
-rw-r--r--package/kernel/mac80211/patches/804-b43-sync-with-bcma.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/804-b43-sync-with-bcma.patch b/package/kernel/mac80211/patches/804-b43-sync-with-bcma.patch
new file mode 100644
index 0000000000..74cd4489f1
--- /dev/null
+++ b/package/kernel/mac80211/patches/804-b43-sync-with-bcma.patch
@@ -0,0 +1,17 @@
+--- a/drivers/net/wireless/broadcom/b43/main.c
++++ b/drivers/net/wireless/broadcom/b43/main.c
+@@ -1215,10 +1215,10 @@ void b43_wireless_core_phy_pll_reset(str
+ case B43_BUS_BCMA:
+ bcma_cc = &dev->dev->bdev->bus->drv_cc;
+
+- bcma_cc_write32(bcma_cc, BCMA_CC_CHIPCTL_ADDR, 0);
+- bcma_cc_mask32(bcma_cc, BCMA_CC_CHIPCTL_DATA, ~0x4);
+- bcma_cc_set32(bcma_cc, BCMA_CC_CHIPCTL_DATA, 0x4);
+- bcma_cc_mask32(bcma_cc, BCMA_CC_CHIPCTL_DATA, ~0x4);
++ bcma_cc_write32(bcma_cc, BCMA_CC_PMU_CHIPCTL_ADDR, 0);
++ bcma_cc_mask32(bcma_cc, BCMA_CC_PMU_CHIPCTL_DATA, ~0x4);
++ bcma_cc_set32(bcma_cc, BCMA_CC_PMU_CHIPCTL_DATA, 0x4);
++ bcma_cc_mask32(bcma_cc, BCMA_CC_PMU_CHIPCTL_DATA, ~0x4);
+ break;
+ #endif
+ #ifdef CPTCFG_B43_SSB