diff --git a/8003-BCM4387-Apple-M1-platform-support.patch b/8003-BCM4387-Apple-M1-platform-support.patch index ba4234b..b511881 100644 --- a/8003-BCM4387-Apple-M1-platform-support.patch +++ b/8003-BCM4387-Apple-M1-platform-support.patch @@ -903,104 +903,6 @@ index 801709c26..792adaf88 100644 2.37.2 -From 0bcbbe3fe191f9b09f90fe8c33f3e20f0ec2ab52 Mon Sep 17 00:00:00 2001 -From: Hector Martin -Date: Tue, 14 Feb 2023 18:24:20 +0900 -Subject: [PATCH 07/10] 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) - -Reviewed-by: Linus Walleij -Reviewed-by: Arend van Spriel -Signed-off-by: Hector Martin ---- - 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 50e0c015c..9f9bf08a7 100644 ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c -@@ -743,6 +743,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 2835ef4ed..d2dad5414 100644 ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c -@@ -67,6 +67,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"); -@@ -101,6 +102,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), /* revision ID 4 */ - BRCMF_FW_ENTRY(BRCM_CC_4378_CHIP_ID, 0xFFFFFFFF, 4378B1), /* revision ID 3 */ -+ BRCMF_FW_ENTRY(BRCM_CC_4387_CHIP_ID, 0xFFFFFFFF, 4387C2), /* revision ID 7 */ - }; - - #define BRCMF_PCIE_FW_UP_TIMEOUT 5000 /* msec */ -@@ -2048,6 +2050,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; -@@ -2662,6 +2669,7 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = { - BRCMF_PCIE_DEVICE(BRCM_PCIE_43596_DEVICE_ID, CYW), - 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), - - { /* 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 896615f57..44684bf1b 100644 ---- a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h -+++ b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h -@@ -54,6 +54,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_43439_CHIP_ID 43439 -@@ -95,6 +96,7 @@ - #define BRCM_PCIE_43596_DEVICE_ID 0x4415 - #define BRCM_PCIE_4377_DEVICE_ID 0x4488 - #define BRCM_PCIE_4378_DEVICE_ID 0x4425 -+#define BRCM_PCIE_4387_DEVICE_ID 0x4433 - - /* brcmsmac IDs */ - #define BCM4313_D11N2G_ID 0x4727 /* 4313 802.11n 2.4G device */ --- -2.37.2 - - From 6476bdb033ad7eb9bea5b7804467543664755da1 Mon Sep 17 00:00:00 2001 From: Hector Martin Date: Tue, 14 Feb 2023 18:24:21 +0900