package/kernel/mac80211/patches/323-0005-brcmfmac-add-support-for-14e4-4365-PCI-ID-with-BCM43.patch

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