2ca6a9381d
* rockchip64: add rk3318-box tvbox board patch and configurations * rockchip64: add missing bcm43342 patch for edge kernel
32 lines
1.9 KiB
Diff
32 lines
1.9 KiB
Diff
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
|
|
index b082b885..a23d6aab 100644
|
|
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
|
|
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
|
|
@@ -611,6 +611,8 @@ static const struct sdiod_drive_str sdiod_drvstr_tab2_3v3[] = {
|
|
#define BCM4330_NVRAM_NAME "brcm/brcmfmac4330-sdio.txt"
|
|
#define BCM4334_FIRMWARE_NAME "brcm/brcmfmac4334-sdio.bin"
|
|
#define BCM4334_NVRAM_NAME "brcm/brcmfmac4334-sdio.txt"
|
|
+#define BCM4334_AP6334_FIRMWARE_NAME "brcm/brcmfmac4334-sdio.bin"
|
|
+#define BCM4334_AP6334_NVRAM_NAME "brcm/brcmfmac4334-sdio.rockchip,rk3318-box.txt"
|
|
#define BCM43340_FIRMWARE_NAME "brcm/brcmfmac43340-sdio.bin"
|
|
#define BCM43340_NVRAM_NAME "brcm/brcmfmac43340-sdio.txt"
|
|
#define BCM4335_FIRMWARE_NAME "brcm/brcmfmac4335-sdio.bin"
|
|
@@ -640,6 +642,7 @@ MODULE_FIRMWARE(BCM4330_FIRMWARE_NAME);
|
|
MODULE_FIRMWARE(BCM4330_NVRAM_NAME);
|
|
MODULE_FIRMWARE(BCM4334_FIRMWARE_NAME);
|
|
MODULE_FIRMWARE(BCM4334_NVRAM_NAME);
|
|
+MODULE_FIRMWARE(BCM4334_AP6334_NVRAM_NAME);
|
|
MODULE_FIRMWARE(BCM43340_FIRMWARE_NAME);
|
|
MODULE_FIRMWARE(BCM43340_NVRAM_NAME);
|
|
MODULE_FIRMWARE(BCM4335_FIRMWARE_NAME);
|
|
@@ -677,7 +680,8 @@ static const struct brcmf_firmware_names brcmf_fwname_data[] = {
|
|
{ BRCM_CC_43241_CHIP_ID, 0xFFFFFFC0, BRCMF_FIRMWARE_NVRAM(BCM43241B5) },
|
|
{ BRCM_CC_4329_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4329) },
|
|
{ BRCM_CC_4330_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4330) },
|
|
- { BRCM_CC_4334_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4334) },
|
|
+ { BRCM_CC_4334_CHIP_ID, 0xFFFFFFF7, BRCMF_FIRMWARE_NVRAM(BCM4334) },
|
|
+ { BRCM_CC_4334_CHIP_ID, 0x8, BRCMF_FIRMWARE_NVRAM(BCM4334_AP6334) },
|
|
{ BRCM_CC_43340_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM43340) },
|
|
{ BRCM_CC_4335_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4335) },
|
|
{ BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, BRCMF_FIRMWARE_NVRAM(BCM43362) },
|