Commit 6d766d8c authored by Hector Martin's avatar Hector Martin Committed by Kalle Valo
Browse files

brcmfmac: pcie: Declare missing firmware files in pcie.c 



Move one of the declarations from sdio.c to pcie.c, since it makes no
sense in the former (SDIO support is optional), and add missing ones.

Fixes: 75729e11 ("brcmfmac: expose firmware config files through modinfo")
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarHector Martin <marcan@marcan.st>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220131160713.245637-5-marcan@marcan.st
parent d19d8e3b

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -59,6 +59,13 @@ BRCMF_FW_DEF(4366B, "brcmfmac4366b-pcie"); 
BRCMF_FW_DEF(4366C, "brcmfmac4366c-pcie");

BRCMF_FW_DEF(4366C, "brcmfmac4366c-pcie");

BRCMF_FW_DEF(4371, "brcmfmac4371-pcie");

BRCMF_FW_DEF(4371, "brcmfmac4371-pcie");





/* firmware config files */

MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-pcie.txt");

MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-pcie.*.txt");



/* per-board firmware binaries */

MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-pcie.*.bin");



static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {

static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {

	BRCMF_FW_ENTRY(BRCM_CC_43602_CHIP_ID, 0xFFFFFFFF, 43602),

	BRCMF_FW_ENTRY(BRCM_CC_43602_CHIP_ID, 0xFFFFFFFF, 43602),

	BRCMF_FW_ENTRY(BRCM_CC_43465_CHIP_ID, 0xFFFFFFF0, 4366C),

	BRCMF_FW_ENTRY(BRCM_CC_43465_CHIP_ID, 0xFFFFFFF0, 4366C),

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -629,7 +629,6 @@ BRCMF_FW_CLM_DEF(43752, "brcmfmac43752-sdio"); 




/* firmware config files */

/* firmware config files */

MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-sdio.*.txt");

MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-sdio.*.txt");

MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-pcie.*.txt");





/* per-board firmware binaries */

/* per-board firmware binaries */

MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-sdio.*.bin");

MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-sdio.*.bin");