From cd6912b71a89ed6a9ad847ebdd7d4b992d396af0 Mon Sep 17 00:00:00 2001 From: Ian Lin Date: Mon, 15 Nov 2021 20:07:37 -0600 Subject: [PATCH 079/296] brcmfmac: support 4373 pcie Add 4373 pcie device id Signed-off-by: Ian Lin --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 6 ++++++ .../net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c index 18955f193964..0198eabb056d 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c @@ -73,6 +73,7 @@ BRCMF_FW_CLM_DEF(4378B1, "brcmfmac4378b1-pcie"); BRCMF_FW_CLM_DEF(4378B3, "brcmfmac4378b3-pcie"); BRCMF_FW_CLM_DEF(4387C2, "brcmfmac4387c2-pcie"); CY_FW_TRXSE_DEF(55560, "cyfmac55560-pcie"); +CY_FW_DEF(4373, "cyfmac4373-pcie"); /* firmware config files */ MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-pcie.txt"); @@ -113,6 +114,7 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = { BRCMF_FW_ENTRY(BRCM_CC_4387_CHIP_ID, 0xFFFFFFFF, 4387C2), /* revision ID 7 */ BRCMF_FW_ENTRY(CY_CC_54591_CHIP_ID, 0xFFFFFFFF, 4355), BRCMF_FW_ENTRY(CY_CC_55560_CHIP_ID, 0xFFFFFFFF, 55560), + BRCMF_FW_ENTRY(CY_CC_4373_CHIP_ID, 0xFFFFFFFF, 4373), }; #define BRCMF_PCIE_READ_SHARED_TIMEOUT 5000 /* msec */ @@ -3284,6 +3286,10 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = { BRCMF_PCIE_DEVICE(CY_PCIE_54590_DEVICE_ID, CYW), BRCMF_PCIE_DEVICE(CY_PCIE_54594_DEVICE_ID, CYW), BRCMF_PCIE_DEVICE_CY(CY_PCIE_55560_DEVICE_ID, CYW), + BRCMF_PCIE_DEVICE(CY_PCIE_4373_RAW_DEVICE_ID, CYW), + BRCMF_PCIE_DEVICE(CY_PCIE_4373_DUAL_DEVICE_ID, CYW), + BRCMF_PCIE_DEVICE(CY_PCIE_4373_2G_DEVICE_ID, CYW), + BRCMF_PCIE_DEVICE(CY_PCIE_4373_5G_DEVICE_ID, CYW), { /* end: all zeroes */ } }; diff --git a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h index 037c32a58868..3ffed00f1ce6 100644 --- a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h +++ b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h @@ -106,6 +106,10 @@ #define CY_PCIE_54590_DEVICE_ID 0x4416 #define CY_PCIE_54594_DEVICE_ID 0x441a #define CY_PCIE_55560_DEVICE_ID 0xbd31 +#define CY_PCIE_4373_RAW_DEVICE_ID 0x4373 +#define CY_PCIE_4373_DUAL_DEVICE_ID 0x4418 +#define CY_PCIE_4373_2G_DEVICE_ID 0x4419 +#define CY_PCIE_4373_5G_DEVICE_ID 0x441a /* brcmsmac IDs */ #define BCM4313_D11N2G_ID 0x4727 /* 4313 802.11n 2.4G device */ -- 2.25.1