re-added patches that didn't apply correctly

Co-authored-by: emergenz <franz.srambical@gmail.com>
This commit is contained in:
Houjun Liu
2021-08-11 11:38:58 -07:00
parent e5d4f6c1d7
commit 010cbdf72a
3 changed files with 52 additions and 3 deletions
+1 -1
View File
@@ -42,7 +42,7 @@ index 60e3b0ce4fd7..a262e2eb36af 100644
static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
BRCMF_FW_ENTRY(BRCM_CC_43602_CHIP_ID, 0xFFFFFFFF, 43602),
@@ -80,6 +81,7 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
@@ -82,6 +82,7 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
BRCMF_FW_ENTRY(BRCM_CC_4366_CHIP_ID, 0xFFFFFFF0, 4366C),
BRCMF_FW_ENTRY(BRCM_CC_43664_CHIP_ID, 0xFFFFFFF0, 4366C),
BRCMF_FW_ENTRY(BRCM_CC_4371_CHIP_ID, 0xFFFFFFFF, 4371),
+47
View File
@@ -0,0 +1,47 @@
From 8cd0a13487afd37a021d8f685d0724990773d9e5 Mon Sep 17 00:00:00 2001
From: Houjun Liu <hliu@shabang.cf>
Date: Wed, 11 Aug 2021 11:28:01 -0700
Subject: [PATCH] added @aunali1 patches that didn't apply correctly
Co-authored-by: Aun-Ali Zaidi <admin@kodeit.net>
Co-authored-by: emergenz <franz.srambical@gmail.com>
---
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 2 ++
drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h | 1 +
2 files changed, 3 insertions(+)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
index d64f9e902..99a86a56e 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
@@ -82,6 +82,7 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
BRCMF_FW_ENTRY(BRCM_CC_43664_CHIP_ID, 0xFFFFFFF0, 4366C),
BRCMF_FW_ENTRY(BRCM_CC_43666_CHIP_ID, 0xFFFFFFF0, 4366C),
BRCMF_FW_ENTRY(BRCM_CC_4371_CHIP_ID, 0xFFFFFFFF, 4371),
+ BRCMF_FW_ENTRY(BRCM_CC_4377_CHIP_ID, 0xFFFFFFFF, 4377),
BRCMF_FW_ENTRY(BRCM_CC_4378_CHIP_ID, 0xFFFFFFFF, 4378),
};
@@ -2364,6 +2365,7 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = {
BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_2G_DEVICE_ID),
BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_5G_DEVICE_ID),
BRCMF_PCIE_DEVICE(BRCM_PCIE_4371_DEVICE_ID),
+ BRCMF_PCIE_DEVICE(BRCM_PCIE_4377_DEVICE_ID),
BRCMF_PCIE_DEVICE(BRCM_PCIE_4378_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 5a13c98b5..eb3f361a2 100644
--- a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
+++ b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
@@ -86,6 +86,7 @@
#define BRCM_PCIE_4366_2G_DEVICE_ID 0x43c4
#define BRCM_PCIE_4366_5G_DEVICE_ID 0x43c5
#define BRCM_PCIE_4371_DEVICE_ID 0x440d
+#define BRCM_PCIE_4377_DEVICE_ID 0x4488
#define BRCM_PCIE_4378_DEVICE_ID 0x4425
--
2.32.0
+4 -2
View File
@@ -59,6 +59,7 @@ source=(
8001-corellium-wifi-bigsur.patch
8002-brcmfmac-4377-mod.patch
8003-brcmfmac-4377-64bit-regs.patch
8004-brcmfmac-4377-chip-ids.patch
)
validpgpkeys=(
@@ -260,5 +261,6 @@ md5sums=('9bd74571c148a7753f5a237ba52f8ee5'
'6b5c2b02c39db21a9fe5c198794059d4'
'b1d2a8aca562ad2bd6ff0bcb48fcbc70'
'7bc42e89f69e546abae185742609ca76'
'aaebba04ae61485024200dcba755da49'
'ad2552bc11f7fd9d57ccda27272fee44')
'af869021bdedfa4b4446f1a39fc02a70'
'ad2552bc11f7fd9d57ccda27272fee44'
'369dbf0800252c3f3ce2fbc26cf7fc53')