Skip to content

Commit 8213257

Browse files
marcanjannau
authored andcommitted
wifi: brcmfmac: Add BCM4388 support
Signed-off-by: Hector Martin <marcan@marcan.st>
1 parent 5e43d24 commit 8213257

3 files changed

Lines changed: 13 additions & 0 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -712,6 +712,7 @@ static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci)
712712
case BRCM_CC_4366_CHIP_ID:
713713
case BRCM_CC_43664_CHIP_ID:
714714
case BRCM_CC_43666_CHIP_ID:
715+
case BRCM_CC_4388_CHIP_ID:
715716
return 0x200000;
716717
case BRCM_CC_4355_CHIP_ID:
717718
case BRCM_CC_4359_CHIP_ID:

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ BRCMF_FW_CLM_DEF(4377B3, "brcmfmac4377b3-pcie");
7171
BRCMF_FW_CLM_DEF(4378B1, "brcmfmac4378b1-pcie");
7272
BRCMF_FW_CLM_DEF(4378B3, "brcmfmac4378b3-pcie");
7373
BRCMF_FW_CLM_DEF(4387C2, "brcmfmac4387c2-pcie");
74+
BRCMF_FW_CLM_DEF(4388B0, "brcmfmac4388b0-pcie");
75+
BRCMF_FW_CLM_DEF(4388C0, "brcmfmac4388c0-pcie");
7476
BRCMF_FW_CLM_DEF(54591, "brcmfmac54591-pcie");
7577

7678
/* firmware config files */
@@ -112,6 +114,8 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
112114
BRCMF_FW_ENTRY(BRCM_CC_4378_CHIP_ID, 0x0000000F, 4378B1), /* revision ID 3 */
113115
BRCMF_FW_ENTRY(BRCM_CC_4378_CHIP_ID, 0xFFFFFFE0, 4378B3), /* revision ID 5 */
114116
BRCMF_FW_ENTRY(BRCM_CC_4387_CHIP_ID, 0xFFFFFFFF, 4387C2), /* revision ID 7 */
117+
BRCMF_FW_ENTRY(BRCM_CC_4388_CHIP_ID, 0x0000000F, 4388B0),
118+
BRCMF_FW_ENTRY(BRCM_CC_4388_CHIP_ID, 0xFFFFFFF0, 4388C0), /* revision ID 4 */
115119
};
116120

117121
#define BRCMF_PCIE_FW_UP_TIMEOUT 5000 /* msec */
@@ -2399,6 +2403,11 @@ static int brcmf_pcie_read_otp(struct brcmf_pciedev_info *devinfo)
23992403
base = 0x113c;
24002404
words = 0x170;
24012405
break;
2406+
case BRCM_CC_4388_CHIP_ID:
2407+
coreid = BCMA_CORE_GCI;
2408+
base = 0x115c;
2409+
words = 0x150;
2410+
break;
24022411
default:
24032412
/* OTP not supported on this chip */
24042413
return 0;
@@ -3089,6 +3098,7 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = {
30893098
BRCMF_PCIE_DEVICE(BRCM_PCIE_4377_DEVICE_ID, WCC_SEED),
30903099
BRCMF_PCIE_DEVICE(BRCM_PCIE_4378_DEVICE_ID, WCC_SEED),
30913100
BRCMF_PCIE_DEVICE(BRCM_PCIE_4387_DEVICE_ID, WCC_SEED),
3101+
BRCMF_PCIE_DEVICE(BRCM_PCIE_4388_DEVICE_ID, WCC_SEED),
30923102
BRCMF_PCIE_DEVICE(BRCM_PCIE_43752_DEVICE_ID, WCC_SEED),
30933103
BRCMF_PCIE_DEVICE(CY_PCIE_54591_DEVICE_ID, CYW),
30943104
{ /* end: all zeroes */ }

drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
#define BRCM_CC_4377_CHIP_ID 0x4377
5858
#define BRCM_CC_4378_CHIP_ID 0x4378
5959
#define BRCM_CC_4387_CHIP_ID 0x4387
60+
#define BRCM_CC_4388_CHIP_ID 0x4388
6061
#define CY_CC_4373_CHIP_ID 0x4373
6162
#define CY_CC_43012_CHIP_ID 43012
6263
#define CY_CC_43439_CHIP_ID 43439
@@ -99,6 +100,7 @@
99100
#define BRCM_PCIE_4377_DEVICE_ID 0x4488
100101
#define BRCM_PCIE_4378_DEVICE_ID 0x4425
101102
#define BRCM_PCIE_4387_DEVICE_ID 0x4433
103+
#define BRCM_PCIE_4388_DEVICE_ID 0x4434
102104
#define CY_PCIE_54591_DEVICE_ID 0x4417
103105

104106
/* brcmsmac IDs */

0 commit comments

Comments
 (0)