Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3062e05 authored by Ondrej Jirman's avatar Ondrej Jirman Committed by Kalle Valo
Browse files

brcmfmac: Loading the correct firmware for brcm43456 



SDIO based brcm43456 is currently misdetected as brcm43455 and the wrong
firmware name is used. Correct the detection and load the correct
firmware file. Chiprev for brcm43456 is "9".

Signed-off-by: default avatarOndrej Jirman <megous@megous.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 0cf83903

drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c

+3 −1
Original line number Diff line number Diff line
@@ -622,6 +622,7 @@ BRCMF_FW_DEF(43430A0, "brcmfmac43430a0-sdio"); 
/* Note the names are not postfixed with a1 for backward compatibility */

BRCMF_FW_DEF(43430A1, "brcmfmac43430-sdio");

BRCMF_FW_DEF(43455, "brcmfmac43455-sdio");

BRCMF_FW_DEF(43456, "brcmfmac43456-sdio");

BRCMF_FW_DEF(4354, "brcmfmac4354-sdio");

BRCMF_FW_DEF(4356, "brcmfmac4356-sdio");

BRCMF_FW_DEF(4373, "brcmfmac4373-sdio");
@@ -642,7 +643,8 @@ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = { 
	BRCMF_FW_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339),

	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000001, 43430A0),

	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFE, 43430A1),

	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFFC0, 43455),

	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0x00000200, 43456),

	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFDC0, 43455),

	BRCMF_FW_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354),

	BRCMF_FW_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356),

	BRCMF_FW_ENTRY(CY_CC_4373_CHIP_ID, 0xFFFFFFFF, 4373),