mac80211: brcmfmac: backport remaining patches from the Linux 5.0
[openwrt/staging/wigyori.git] / package / kernel / mac80211 / patches / brcm / 329-v5.0-0001-brcmfmac-add-4354-raw-pcie-device-id.patch
1 From eb6b33bfb8f56859df7264dccc2ca8ab7c57342a Mon Sep 17 00:00:00 2001
2 From: Winnie Chang <winnie.chang@cypress.com>
3 Date: Wed, 21 Nov 2018 07:53:42 +0000
4 Subject: [PATCH] brcmfmac: add 4354 raw pcie device id
5
6 Add the raw 4354 PCIe device ID for unprogrammed Cypress boards.
7
8 Reviewed-by: Arend Van Spriel <arend@broadcom.com>
9 Signed-off-by: Winnie Chang <winnie.chang@cypress.com>
10 Signed-off-by: Chi-Hsien Lin <chi-hsien.lin@cypress.com>
11 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
12 ---
13 drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 1 +
14 drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h | 1 +
15 2 files changed, 2 insertions(+)
16
17 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
18 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
19 @@ -2019,6 +2019,7 @@ static const struct dev_pm_ops brcmf_pci
20 static const struct pci_device_id brcmf_pcie_devid_table[] = {
21 BRCMF_PCIE_DEVICE(BRCM_PCIE_4350_DEVICE_ID),
22 BRCMF_PCIE_DEVICE_SUB(0x4355, BRCM_PCIE_VENDOR_ID_BROADCOM, 0x4355),
23 + BRCMF_PCIE_DEVICE(BRCM_PCIE_4354_RAW_DEVICE_ID),
24 BRCMF_PCIE_DEVICE(BRCM_PCIE_4356_DEVICE_ID),
25 BRCMF_PCIE_DEVICE(BRCM_PCIE_43567_DEVICE_ID),
26 BRCMF_PCIE_DEVICE(BRCM_PCIE_43570_DEVICE_ID),
27 --- a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
28 +++ b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
29 @@ -74,6 +74,7 @@
30 /* PCIE Device IDs */
31 #define BRCM_PCIE_4350_DEVICE_ID 0x43a3
32 #define BRCM_PCIE_4354_DEVICE_ID 0x43df
33 +#define BRCM_PCIE_4354_RAW_DEVICE_ID 0x4354
34 #define BRCM_PCIE_4356_DEVICE_ID 0x43ec
35 #define BRCM_PCIE_43567_DEVICE_ID 0x43d3
36 #define BRCM_PCIE_43570_DEVICE_ID 0x43d9