aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/804-b43-sync-with-bcma.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-02-29 17:19:04 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-02-29 17:19:04 +0000
commitf3a1db04f0ebba577598f1577d3c8c756c8bf757 (patch)
treeeecfe6c9154a9e0717573daba16d1c58bd674d2e /package/kernel/mac80211/patches/804-b43-sync-with-bcma.patch
parent5db86ba649298bef0066cac8e4d0e17834f6b7b0 (diff)
downloadupstream-f3a1db04f0ebba577598f1577d3c8c756c8bf757.tar.gz
upstream-f3a1db04f0ebba577598f1577d3c8c756c8bf757.tar.bz2
upstream-f3a1db04f0ebba577598f1577d3c8c756c8bf757.zip
mac80211: backport from trunk r48782 + required kernel patches and mt76, mwlwifi
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48822 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/804-b43-sync-with-bcma.patch')
-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