aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-04-28 17:59:24 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-04-28 17:59:24 +0000
commit3cbc3b73aaa364b9cc76be6ce3e4f66d62ab25ab (patch)
treeabf388bf8f45a2f61a2b29eb8f4f684894588e2f /package
parentb014140c2e15d428aa2e014553e32e1b9d9196fe (diff)
downloadupstream-3cbc3b73aaa364b9cc76be6ce3e4f66d62ab25ab.tar.gz
upstream-3cbc3b73aaa364b9cc76be6ce3e4f66d62ab25ab.tar.bz2
upstream-3cbc3b73aaa364b9cc76be6ce3e4f66d62ab25ab.zip
mac80211: brcmsmac: remove initial support for core rev 28
To add support for core rev 28 there are a lot more changes needed. SVN-Revision: 36477
Diffstat (limited to 'package')
-rw-r--r--package/mac80211/patches/850-brcmsmac-start-adding-support-for-core-rev-28.patch75
1 files changed, 0 insertions, 75 deletions
diff --git a/package/mac80211/patches/850-brcmsmac-start-adding-support-for-core-rev-28.patch b/package/mac80211/patches/850-brcmsmac-start-adding-support-for-core-rev-28.patch
deleted file mode 100644
index e181ac3870..0000000000
--- a/package/mac80211/patches/850-brcmsmac-start-adding-support-for-core-rev-28.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
-+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
-@@ -101,6 +101,7 @@ static struct bcma_device_id brcms_corei
- BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 17, BCMA_ANY_CLASS),
- BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 23, BCMA_ANY_CLASS),
- BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 24, BCMA_ANY_CLASS),
-+// BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 28, BCMA_ANY_CLASS),
- BCMA_CORETABLE_END
- };
- MODULE_DEVICE_TABLE(bcma, brcms_coreid_table);
---- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
-+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
-@@ -722,7 +722,7 @@ static void brcms_c_ucode_bsinit(struct
- brcms_c_write_mhf(wlc_hw, wlc_hw->band->mhfs);
-
- /* do band-specific ucode IHR, SHM, and SCR inits */
-- if (D11REV_IS(wlc_hw->corerev, 17) || D11REV_IS(wlc_hw->corerev, 23)) {
-+ if (D11REV_IS(wlc_hw->corerev, 17) || D11REV_IS(wlc_hw->corerev, 23) || D11REV_IS(wlc_hw->corerev, 28)) {
- if (BRCMS_ISNPHY(wlc_hw->band))
- brcms_c_write_inits(wlc_hw, ucode->d11n0bsinitvals16);
- else
-@@ -2288,7 +2288,7 @@ static void brcms_ucode_download(struct
- if (wlc_hw->ucode_loaded)
- return;
-
-- if (D11REV_IS(wlc_hw->corerev, 17) || D11REV_IS(wlc_hw->corerev, 23)) {
-+ if (D11REV_IS(wlc_hw->corerev, 17) || D11REV_IS(wlc_hw->corerev, 23) || D11REV_IS(wlc_hw->corerev, 28)) {
- if (BRCMS_ISNPHY(wlc_hw->band)) {
- brcms_ucode_write(wlc_hw, ucode->bcm43xx_16_mimo,
- ucode->bcm43xx_16_mimosz);
-@@ -3231,7 +3231,7 @@ static void brcms_b_coreinit(struct brcm
-
- sflags = bcma_aread32(core, BCMA_IOST);
-
-- if (D11REV_IS(wlc_hw->corerev, 17) || D11REV_IS(wlc_hw->corerev, 23)) {
-+ if (D11REV_IS(wlc_hw->corerev, 17) || D11REV_IS(wlc_hw->corerev, 23) || D11REV_IS(wlc_hw->corerev, 28)) {
- if (BRCMS_ISNPHY(wlc_hw->band))
- brcms_c_write_inits(wlc_hw, ucode->d11n0initvals16);
- else
-@@ -5723,6 +5723,8 @@ static bool brcms_c_chipmatch_soc(struct
-
- if (chipinfo->id == BCMA_CHIP_ID_BCM4716)
- return true;
-+ if (chipinfo->id == BCMA_CHIP_ID_BCM5357)
-+ return true;
-
- pr_err("unknown chip id %04x\n", chipinfo->id);
- return false;
---- a/drivers/net/wireless/brcm80211/brcmsmac/main.h
-+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.h
-@@ -65,7 +65,7 @@
- #define SW_TIMER_MAC_STAT_UPD 30 /* periodic MAC stats update */
-
- /* max # supported core revisions (0 .. MAXCOREREV - 1) */
--#define MAXCOREREV 28
-+#define MAXCOREREV 29
-
- /* Double check that unsupported cores are not enabled */
- #if CONF_MSK(D11CONF, 0x4f) || CONF_GE(D11CONF, MAXCOREREV)
---- a/drivers/net/wireless/brcm80211/brcmsmac/types.h
-+++ b/drivers/net/wireless/brcm80211/brcmsmac/types.h
-@@ -93,11 +93,11 @@
- #define BOARD_GPIO_13 0x2000
-
- /* **** Core type/rev defaults **** */
--#define D11CONF 0x0fffffb0 /* Supported D11 revs: 4, 5, 7-27
-+#define D11CONF 0x1fffffb0 /* Supported D11 revs: 4, 5, 7-27
- * also need to update wlc.h MAXCOREREV
- */
-
--#define NCONF 0x000001ff /* Supported nphy revs:
-+#define NCONF 0x000002ff /* Supported nphy revs:
- * 0 4321a0
- * 1 4321a1
- * 2 4321b0/b1/c0/c1