39 lines
1.7 KiB
Diff
39 lines
1.7 KiB
Diff
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
||
|
|
Date: Tue, 26 Jan 2016 17:57:05 +0100
|
||
|
|
Subject: [PATCH] brcmfmac: add support for 14e4:4365 PCI ID with BCM4366
|
||
|
|
chipset
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
On Broadcom ARM routers BCM4366 cards are available with 14e4:4365 ID.
|
||
|
|
Unfortunately this ID was already used by Broadcom for cards with
|
||
|
|
BCM43142, a totally different chipset requiring SoftMAC driver. To avoid
|
||
|
|
a conflict between brcmfmac and bcma use more specific ID entry with
|
||
|
|
subvendor and subdevice specified.
|
||
|
|
|
||
|
|
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
||
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
||
|
|
---
|
||
|
|
|
||
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
|
||
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
|
||
|
|
@@ -1951,6 +1951,9 @@ static const struct dev_pm_ops brcmf_pci
|
||
|
|
|
||
|
|
#define BRCMF_PCIE_DEVICE(dev_id) { BRCM_PCIE_VENDOR_ID_BROADCOM, dev_id,\
|
||
|
|
PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_NETWORK_OTHER << 8, 0xffff00, 0 }
|
||
|
|
+#define BRCMF_PCIE_DEVICE_SUB(dev_id, subvend, subdev) { \
|
||
|
|
+ BRCM_PCIE_VENDOR_ID_BROADCOM, dev_id,\
|
||
|
|
+ subvend, subdev, PCI_CLASS_NETWORK_OTHER << 8, 0xffff00, 0 }
|
||
|
|
|
||
|
|
static struct pci_device_id brcmf_pcie_devid_table[] = {
|
||
|
|
BRCMF_PCIE_DEVICE(BRCM_PCIE_4350_DEVICE_ID),
|
||
|
|
@@ -1966,6 +1969,7 @@ static struct pci_device_id brcmf_pcie_d
|
||
|
|
BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_DEVICE_ID),
|
||
|
|
BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_2G_DEVICE_ID),
|
||
|
|
BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_5G_DEVICE_ID),
|
||
|
|
+ BRCMF_PCIE_DEVICE_SUB(0x4365, BRCM_PCIE_VENDOR_ID_BROADCOM, 0x4365),
|
||
|
|
BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_DEVICE_ID),
|
||
|
|
BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_2G_DEVICE_ID),
|
||
|
|
BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_5G_DEVICE_ID),
|