You've already forked linux-t2-patches
mirror of
https://github.com/t2linux/linux-t2-patches.git
synced 2026-04-30 13:52:11 -07:00
Redecorating
96 lines
3.7 KiB
Diff
96 lines
3.7 KiB
Diff
From 534075f8cc83a2d5b57af7622e0bc03277e2aa84 Mon Sep 17 00:00:00 2001
|
|
From: Hector Martin <marcan@marcan.st>
|
|
Date: Tue, 21 Dec 2021 17:52:03 +0900
|
|
Subject: [PATCH 26/34] brcmfmac: pcie: Add IDs/properties for BCM4387
|
|
|
|
This chip is present on Apple M1 Pro/Max (t600x) platforms:
|
|
|
|
* maldives (apple,j314s): MacBook Pro (14-inch, M1 Pro, 2021)
|
|
* maldives (apple,j314c): MacBook Pro (14-inch, M1 Max, 2021)
|
|
* madagascar (apple,j316s): MacBook Pro (16-inch, M1 Pro, 2021)
|
|
* madagascar (apple,j316c): MacBook Pro (16-inch, M1 Max, 2021)
|
|
|
|
Signed-off-by: Hector Martin <marcan@marcan.st>
|
|
---
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c | 2 ++
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 8 ++++++++
|
|
.../net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h | 2 ++
|
|
3 files changed, 12 insertions(+)
|
|
|
|
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
|
|
index c4c80664b..f7ca9ff29 100644
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
|
|
@@ -742,6 +742,8 @@ static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci)
|
|
return 0x170000;
|
|
case BRCM_CC_4378_CHIP_ID:
|
|
return 0x352000;
|
|
+ case BRCM_CC_4387_CHIP_ID:
|
|
+ return 0x740000;
|
|
default:
|
|
brcmf_err("unknown chip: %s\n", ci->pub.name);
|
|
break;
|
|
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
|
|
index b6b789b49..bc2a53812 100644
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
|
|
@@ -63,6 +63,7 @@ BRCMF_FW_DEF(4366C, "brcmfmac4366c-pcie");
|
|
BRCMF_FW_DEF(4371, "brcmfmac4371-pcie");
|
|
BRCMF_FW_CLM_DEF(4377B3, "brcmfmac4377b3-pcie");
|
|
BRCMF_FW_CLM_DEF(4378B1, "brcmfmac4378b1-pcie");
|
|
+BRCMF_FW_CLM_DEF(4387C2, "brcmfmac4387c2-pcie");
|
|
|
|
/* firmware config files */
|
|
MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-pcie.txt");
|
|
@@ -96,6 +97,7 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
|
|
BRCMF_FW_ENTRY(BRCM_CC_4371_CHIP_ID, 0xFFFFFFFF, 4371),
|
|
BRCMF_FW_ENTRY(BRCM_CC_4377_CHIP_ID, 0xFFFFFFFF, 4377B3), /* 4 */
|
|
BRCMF_FW_ENTRY(BRCM_CC_4378_CHIP_ID, 0xFFFFFFFF, 4378B1), /* 3 */
|
|
+ BRCMF_FW_ENTRY(BRCM_CC_4387_CHIP_ID, 0xFFFFFFFF, 4387C2), /* 7 */
|
|
};
|
|
|
|
#define BRCMF_PCIE_FW_UP_TIMEOUT 5000 /* msec */
|
|
@@ -2070,6 +2072,11 @@ static int brcmf_pcie_read_otp(struct brcmf_pciedev_info *devinfo)
|
|
base = 0x1120;
|
|
words = 0x170;
|
|
break;
|
|
+ case BRCM_CC_4387_CHIP_ID:
|
|
+ coreid = BCMA_CORE_GCI;
|
|
+ base = 0x113c;
|
|
+ words = 0x170;
|
|
+ break;
|
|
default:
|
|
/* OTP not supported on this chip */
|
|
return 0;
|
|
@@ -2580,6 +2587,7 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = {
|
|
BRCMF_PCIE_DEVICE(BRCM_PCIE_4371_DEVICE_ID),
|
|
BRCMF_PCIE_DEVICE(BRCM_PCIE_4377_DEVICE_ID),
|
|
BRCMF_PCIE_DEVICE(BRCM_PCIE_4378_DEVICE_ID),
|
|
+ BRCMF_PCIE_DEVICE(BRCM_PCIE_4387_DEVICE_ID),
|
|
{ /* 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 54d7ec515..3d6c803fb 100644
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
|
|
@@ -53,6 +53,7 @@
|
|
#define BRCM_CC_4371_CHIP_ID 0x4371
|
|
#define BRCM_CC_4377_CHIP_ID 0x4377
|
|
#define BRCM_CC_4378_CHIP_ID 0x4378
|
|
+#define BRCM_CC_4387_CHIP_ID 0x4387
|
|
#define CY_CC_4373_CHIP_ID 0x4373
|
|
#define CY_CC_43012_CHIP_ID 43012
|
|
#define CY_CC_43752_CHIP_ID 43752
|
|
@@ -91,6 +92,7 @@
|
|
#define BRCM_PCIE_4371_DEVICE_ID 0x440d
|
|
#define BRCM_PCIE_4377_DEVICE_ID 0x4488
|
|
#define BRCM_PCIE_4378_DEVICE_ID 0x4425
|
|
+#define BRCM_PCIE_4387_DEVICE_ID 0x4433
|
|
|
|
|
|
/* brcmsmac IDs */
|
|
--
|
|
2.34.1
|
|
|