NVIDIA: SAUCE: brcmfmac: Resolve compilation errors of chip ID 0x4355

BugLink: https://bugs.launchpad.net/bugs/2072591

Fix the build issue when enabling the config CONFIG_BRCMFMAC_PCIE
   - Remove redefinition of fw name for chip ID 0x4355
   - Add fw vendor name in macro BRCMF_PCIE_DEVICE for chip ID 0x4355

http://nvbugs/4742326

Signed-off-by: ruppala <ruppala@nvidia.com>
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Acked-by: Jacob Martin <jacob.martin@canonical.com>
Acked-by: Noah Wager <noah.wager@canonical.com>
Signed-off-by: Noah Wager <noah.wager@canonical.com>
This commit is contained in:
ruppala
2024-07-11 05:50:48 +00:00
committed by Noah Wager
parent 6d2460bffb
commit 3d739dc909
@@ -52,7 +52,6 @@ enum brcmf_pcie_state {
BRCMF_FW_DEF(43602, "brcmfmac43602-pcie");
BRCMF_FW_DEF(4350, "brcmfmac4350-pcie");
BRCMF_FW_DEF(4350C, "brcmfmac4350c2-pcie");
CY_FW_DEF(4355, "cyfmac89459-pcie");
BRCMF_FW_CLM_DEF(4355C1, "brcmfmac4355c1-pcie");
CY_FW_DEF(4356, "cyfmac4356-pcie");
CY_FW_DEF(43570, "cyfmac43570-pcie");
@@ -2770,7 +2769,7 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = {
BRCMF_PCIE_DEVICE(BRCM_PCIE_4377_DEVICE_ID, WCC),
BRCMF_PCIE_DEVICE(BRCM_PCIE_4378_DEVICE_ID, WCC),
BRCMF_PCIE_DEVICE(BRCM_PCIE_4387_DEVICE_ID, WCC),
BRCMF_PCIE_DEVICE(CY_PCIE_54591_DEVICE_ID),
BRCMF_PCIE_DEVICE(CY_PCIE_54591_DEVICE_ID, CYW),
{ /* end: all zeroes */ }
};