mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-15 06:35:20 +02:00
20f4a947e0
The firmware from linux-firmware does not support the rev 17 core found in a bcm4716. The firmware extracted from the proprietary driver supports this core. Use this firmware instead by default. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33669 3c298f89-4303-0410-b956-a3cf2f4a3e73
40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
|
|
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
|
|
@@ -94,6 +94,7 @@ MODULE_FIRMWARE("brcm/bcm43xx_hdr-0.fw")
|
|
|
|
/* recognized BCMA Core IDs */
|
|
static struct bcma_device_id brcms_coreid_table[] = {
|
|
+ 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_CORETABLE_END
|
|
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
|
|
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
|
|
@@ -734,7 +734,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, 23)) {
|
|
+ if (D11REV_IS(wlc_hw->corerev, 17) || D11REV_IS(wlc_hw->corerev, 23)) {
|
|
if (BRCMS_ISNPHY(wlc_hw->band))
|
|
brcms_c_write_inits(wlc_hw, ucode->d11n0bsinitvals16);
|
|
else
|
|
@@ -2259,7 +2259,7 @@ static void brcms_ucode_download(struct
|
|
if (wlc_hw->ucode_loaded)
|
|
return;
|
|
|
|
- if (D11REV_IS(wlc_hw->corerev, 23)) {
|
|
+ if (D11REV_IS(wlc_hw->corerev, 17) || D11REV_IS(wlc_hw->corerev, 23)) {
|
|
if (BRCMS_ISNPHY(wlc_hw->band)) {
|
|
brcms_ucode_write(wlc_hw, ucode->bcm43xx_16_mimo,
|
|
ucode->bcm43xx_16_mimosz);
|
|
@@ -3221,7 +3221,7 @@ static void brcms_b_coreinit(struct brcm
|
|
|
|
sflags = bcma_aread32(core, BCMA_IOST);
|
|
|
|
- if (D11REV_IS(wlc_hw->corerev, 23)) {
|
|
+ if (D11REV_IS(wlc_hw->corerev, 17) || D11REV_IS(wlc_hw->corerev, 23)) {
|
|
if (BRCMS_ISNPHY(wlc_hw->band))
|
|
brcms_c_write_inits(wlc_hw, ucode->d11n0initvals16);
|
|
else
|