package/kernel/mac80211/patches/352-brcmfmac-remove-support-for-unreleased-BCM4354-PCIe.patch

   1 From: Arend van Spriel <arend@broadcom.com>
   2 Date: Wed, 18 Mar 2015 13:25:28 +0100
   3 Subject: [PATCH] brcmfmac: remove support for unreleased BCM4354 PCIe
   4
   5 There are no known BCM4354 PCIe devices released so removing
   6 support from the driver until proven otherwise.
   7
   8 Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
   9 Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
  10 Signed-off-by: Arend van Spriel <arend@broadcom.com>
  11 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  12 ---
  13
  14 --- a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
  15 +++ b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
  16 @@ -47,8 +47,6 @@ enum brcmf_pcie_state {
  17
  18  #define BRCMF_PCIE_43602_FW_NAME               "brcm/brcmfmac43602-pcie.bin"
  19  #define BRCMF_PCIE_43602_NVRAM_NAME            "brcm/brcmfmac43602-pcie.txt"
  20 -#define BRCMF_PCIE_4354_FW_NAME                        "brcm/brcmfmac4354-pcie.bin"
  21 -#define BRCMF_PCIE_4354_NVRAM_NAME             "brcm/brcmfmac4354-pcie.txt"
  22  #define BRCMF_PCIE_4356_FW_NAME                        "brcm/brcmfmac4356-pcie.bin"
  23  #define BRCMF_PCIE_4356_NVRAM_NAME             "brcm/brcmfmac4356-pcie.txt"
  24  #define BRCMF_PCIE_43570_FW_NAME               "brcm/brcmfmac43570-pcie.bin"
  25 @@ -187,8 +185,6 @@ enum brcmf_pcie_state {
  26
  27  MODULE_FIRMWARE(BRCMF_PCIE_43602_FW_NAME);
  28  MODULE_FIRMWARE(BRCMF_PCIE_43602_NVRAM_NAME);
  29 -MODULE_FIRMWARE(BRCMF_PCIE_4354_FW_NAME);
  30 -MODULE_FIRMWARE(BRCMF_PCIE_4354_NVRAM_NAME);
  31  MODULE_FIRMWARE(BRCMF_PCIE_4356_FW_NAME);
  32  MODULE_FIRMWARE(BRCMF_PCIE_4356_NVRAM_NAME);
  33  MODULE_FIRMWARE(BRCMF_PCIE_43570_FW_NAME);
  34 @@ -1327,10 +1323,6 @@ static int brcmf_pcie_get_fwnames(struct
  35                 fw_name = BRCMF_PCIE_43602_FW_NAME;
  36                 nvram_name = BRCMF_PCIE_43602_NVRAM_NAME;
  37                 break;
  38 -       case BRCM_CC_4354_CHIP_ID:
  39 -               fw_name = BRCMF_PCIE_4354_FW_NAME;
  40 -               nvram_name = BRCMF_PCIE_4354_NVRAM_NAME;
  41 -               break;
  42         case BRCM_CC_4356_CHIP_ID:
  43                 fw_name = BRCMF_PCIE_4356_FW_NAME;
  44                 nvram_name = BRCMF_PCIE_4356_NVRAM_NAME;
  45 @@ -1855,7 +1847,6 @@ cleanup:
  46         PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_NETWORK_OTHER << 8, 0xffff00, 0 }
  47
  48  static struct pci_device_id brcmf_pcie_devid_table[] = {
  49 -       BRCMF_PCIE_DEVICE(BRCM_PCIE_4354_DEVICE_ID),
  50         BRCMF_PCIE_DEVICE(BRCM_PCIE_4356_DEVICE_ID),
  51         BRCMF_PCIE_DEVICE(BRCM_PCIE_43567_DEVICE_ID),
  52         BRCMF_PCIE_DEVICE(BRCM_PCIE_43570_DEVICE_ID),