package/kernel/mac80211/patches/351-brcmfmac-only-support-the-BCM43455-7-device.patch

   1 From: Arend van Spriel <arend@broadcom.com>
   2 Date: Wed, 18 Mar 2015 13:25:27 +0100
   3 Subject: [PATCH] brcmfmac: only support the BCM43455/7 device
   4
   5 Recently support was added for the BCM4345 SDIO chipset by
   6 commit 9c51026509d7 ("brcmfmac: Add support for BCM4345 SDIO chipset")
   7 however this was verified using a BCM43455 device, which is
   8 a more recent revision of the chip. This patch assure that
   9 older revisions are not probed as they would fail.
  10
  11 Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
  12 Reviewed-by: Syed Asifful Dayyan <syedd@broadcom.com>
  13 Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
  14 Signed-off-by: Arend van Spriel <arend@broadcom.com>
  15 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  16 ---
  17
  18 --- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
  19 +++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
  20 @@ -617,8 +617,8 @@ static const struct sdiod_drive_str sdio
  21  #define BCM4339_NVRAM_NAME             "brcm/brcmfmac4339-sdio.txt"
  22  #define BCM43430_FIRMWARE_NAME         "brcm/brcmfmac43430-sdio.bin"
  23  #define BCM43430_NVRAM_NAME            "brcm/brcmfmac43430-sdio.txt"
  24 -#define BCM4345_FIRMWARE_NAME          "brcm/brcmfmac4345-sdio.bin"
  25 -#define BCM4345_NVRAM_NAME             "brcm/brcmfmac4345-sdio.txt"
  26 +#define BCM43455_FIRMWARE_NAME         "brcm/brcmfmac43455-sdio.bin"
  27 +#define BCM43455_NVRAM_NAME            "brcm/brcmfmac43455-sdio.txt"
  28  #define BCM4354_FIRMWARE_NAME          "brcm/brcmfmac4354-sdio.bin"
  29  #define BCM4354_NVRAM_NAME             "brcm/brcmfmac4354-sdio.txt"
  30
  31 @@ -644,8 +644,8 @@ MODULE_FIRMWARE(BCM4339_FIRMWARE_NAME);
  32  MODULE_FIRMWARE(BCM4339_NVRAM_NAME);
  33  MODULE_FIRMWARE(BCM43430_FIRMWARE_NAME);
  34  MODULE_FIRMWARE(BCM43430_NVRAM_NAME);
  35 -MODULE_FIRMWARE(BCM4345_FIRMWARE_NAME);
  36 -MODULE_FIRMWARE(BCM4345_NVRAM_NAME);
  37 +MODULE_FIRMWARE(BCM43455_FIRMWARE_NAME);
  38 +MODULE_FIRMWARE(BCM43455_NVRAM_NAME);
  39  MODULE_FIRMWARE(BCM4354_FIRMWARE_NAME);
  40  MODULE_FIRMWARE(BCM4354_NVRAM_NAME);
  41
  42 @@ -676,7 +676,7 @@ static const struct brcmf_firmware_names
  43         { BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, BRCMF_FIRMWARE_NVRAM(BCM43362) },
  44         { BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4339) },
  45         { BRCM_CC_43430_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM43430) },
  46 -       { BRCM_CC_4345_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4345) },
  47 +       { BRCM_CC_4345_CHIP_ID, 0xFFFFFFC0, BRCMF_FIRMWARE_NVRAM(BCM43455) },
  48         { BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4354) }
  49  };
  50