From 0515b5bd2b101df2a574f2242acb99ef2dd89655 Mon Sep 17 00:00:00 2001 From: Double Lo Date: Tue, 12 May 2020 01:37:54 -0500 Subject: [PATCH 040/296] brcmfmac: move firmware path to cypress folder To support upstreaming cypress firmware, move the firmware path to /lib/firmware/cypress. The new files in "cypress" folder will be called cyfmac-.bin/clm_blob/txt. Signed-off-by: Double Lo --- .../broadcom/brcm80211/brcmfmac/firmware.h | 7 +++++++ .../broadcom/brcm80211/brcmfmac/pcie.c | 11 +++++----- .../broadcom/brcm80211/brcmfmac/sdio.c | 20 +++++++++---------- .../broadcom/brcm80211/brcmfmac/usb.c | 2 +- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h index 1266cbaee072..6003994e88b2 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h @@ -13,6 +13,8 @@ #define BRCMF_FW_MAX_BOARD_TYPES 8 +#define CY_FW_DEFAULT_PATH "cypress/" + /** * struct brcmf_firmware_mapping - Used to map chipid/revmask to firmware * filename and nvram filename. Each bus type implementation should create @@ -41,6 +43,11 @@ static const char BRCM_ ## fw_name ## _FIRMWARE_BASENAME[] = \ MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw_base ".bin"); \ MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw_base ".clm_blob") +#define CY_FW_DEF(fw_name, fw_base) \ +static const char BRCM_ ## fw_name ## _FIRMWARE_BASENAME[] = \ + CY_FW_DEFAULT_PATH fw_base; \ +MODULE_FIRMWARE(CY_FW_DEFAULT_PATH fw_base ".bin") + #define BRCMF_FW_ENTRY(chipid, mask, name) \ { chipid, mask, BRCM_ ## name ## _FIRMWARE_BASENAME } diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c index ffa7712f7d45..cab4903c0d8e 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c @@ -53,12 +53,12 @@ enum brcmf_pcie_state { BRCMF_FW_DEF(43602, "brcmfmac43602-pcie"); BRCMF_FW_DEF(4350, "brcmfmac4350-pcie"); BRCMF_FW_DEF(4350C, "brcmfmac4350c2-pcie"); -BRCMF_FW_CLM_DEF(4355, "brcmfmac4355-pcie"); +CY_FW_DEF(4355, "cyfmac89459-pcie"); BRCMF_FW_CLM_DEF(4355C1, "brcmfmac4355c1-pcie"); -BRCMF_FW_CLM_DEF(4356, "brcmfmac4356-pcie"); -BRCMF_FW_CLM_DEF(43570, "brcmfmac43570-pcie"); +CY_FW_DEF(4356, "cyfmac4356-pcie"); +CY_FW_DEF(43570, "cyfmac43570-pcie"); BRCMF_FW_DEF(4358, "brcmfmac4358-pcie"); -BRCMF_FW_DEF(4359, "brcmfmac4359-pcie"); +CY_FW_DEF(4359, "cyfmac4359-pcie"); BRCMF_FW_DEF(4359C, "brcmfmac4359c-pcie"); BRCMF_FW_CLM_DEF(4364B2, "brcmfmac4364b2-pcie"); BRCMF_FW_CLM_DEF(4364B3, "brcmfmac4364b3-pcie"); @@ -71,7 +71,8 @@ BRCMF_FW_CLM_DEF(4377B3, "brcmfmac4377b3-pcie"); BRCMF_FW_CLM_DEF(4378B1, "brcmfmac4378b1-pcie"); BRCMF_FW_CLM_DEF(4378B3, "brcmfmac4378b3-pcie"); BRCMF_FW_CLM_DEF(4387C2, "brcmfmac4387c2-pcie"); -BRCMF_FW_DEF(54591, "brcmfmac54591-pcie"); +CY_FW_DEF(54591, "brcmfmac54591-pcie"); + /* firmware config files */ MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-pcie.txt"); diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c index 09a6726fc9cf..412afb75d2ea 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -620,22 +620,22 @@ BRCMF_FW_DEF(43241B5, "brcmfmac43241b5-sdio"); BRCMF_FW_DEF(4329, "brcmfmac4329-sdio"); BRCMF_FW_DEF(4330, "brcmfmac4330-sdio"); BRCMF_FW_DEF(4334, "brcmfmac4334-sdio"); -BRCMF_FW_DEF(43340, "brcmfmac43340-sdio"); +CY_FW_DEF(43340, "cyfmac43340-sdio"); BRCMF_FW_DEF(4335, "brcmfmac4335-sdio"); -BRCMF_FW_DEF(43362, "brcmfmac43362-sdio"); -BRCMF_FW_DEF(4339, "brcmfmac4339-sdio"); +CY_FW_DEF(43362, "cyfmac43362-sdio"); +CY_FW_DEF(4339, "cyfmac4339-sdio"); BRCMF_FW_DEF(43430A0, "brcmfmac43430a0-sdio"); /* Note the names are not postfixed with a1 for backward compatibility */ -BRCMF_FW_CLM_DEF(43430A1, "brcmfmac43430-sdio"); +CY_FW_DEF(43430A1, "cyfmac43430-sdio"); BRCMF_FW_DEF(43430B0, "brcmfmac43430b0-sdio"); BRCMF_FW_CLM_DEF(43439, "brcmfmac43439-sdio"); -BRCMF_FW_CLM_DEF(43455, "brcmfmac43455-sdio"); +CY_FW_DEF(43455, "cyfmac43455-sdio"); BRCMF_FW_DEF(43456, "brcmfmac43456-sdio"); -BRCMF_FW_CLM_DEF(4354, "brcmfmac4354-sdio"); -BRCMF_FW_CLM_DEF(4356, "brcmfmac4356-sdio"); -BRCMF_FW_DEF(4359, "brcmfmac4359-sdio"); -BRCMF_FW_CLM_DEF(4373, "brcmfmac4373-sdio"); -BRCMF_FW_CLM_DEF(43012, "brcmfmac43012-sdio"); +CY_FW_DEF(4354, "cyfmac4354-sdio"); +CY_FW_DEF(4356, "cyfmac4356-sdio"); +CY_FW_DEF(4359, "cyfmac4359-sdio"); +CY_FW_DEF(4373, "cyfmac4373-sdio"); +CY_FW_DEF(43012, "cyfmac43012-sdio"); BRCMF_FW_CLM_DEF(43752, "brcmfmac43752-sdio"); /* firmware config files */ diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c index 0b907ef4ab9e..5f27108e8860 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c @@ -40,7 +40,7 @@ BRCMF_FW_DEF(43143, "brcmfmac43143"); BRCMF_FW_DEF(43236B, "brcmfmac43236b"); BRCMF_FW_DEF(43242A, "brcmfmac43242a"); BRCMF_FW_DEF(43569, "brcmfmac43569"); -BRCMF_FW_DEF(4373, "brcmfmac4373"); +CY_FW_DEF(4373, "cyfmac4373"); static const struct brcmf_firmware_mapping brcmf_usb_fwnames[] = { BRCMF_FW_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143), -- 2.25.1