git.openwrt.org Git - openwrt/staging/jow.git/blob

   1 From e3062e05e1cfe378bb9b3fa0bef46711372bcf13 Mon Sep 17 00:00:00 2001
   2 From: Ondrej Jirman <megous@megous.com>
   3 Date: Sat, 6 Apr 2019 01:45:13 +0200
   4 Subject: [PATCH] brcmfmac: Loading the correct firmware for brcm43456
   5
   6 SDIO based brcm43456 is currently misdetected as brcm43455 and the wrong
   7 firmware name is used. Correct the detection and load the correct
   8 firmware file. Chiprev for brcm43456 is "9".
   9
  10 Signed-off-by: Ondrej Jirman <megous@megous.com>
  11 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  12 ---
  13  drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 +++-
  14  1 file changed, 3 insertions(+), 1 deletion(-)
  15
  16 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
  17 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
  18 @@ -622,6 +622,7 @@ BRCMF_FW_DEF(43430A0, "brcmfmac43430a0-s
  19  /* Note the names are not postfixed with a1 for backward compatibility */
  20  BRCMF_FW_DEF(43430A1, "brcmfmac43430-sdio");
  21  BRCMF_FW_DEF(43455, "brcmfmac43455-sdio");
  22 +BRCMF_FW_DEF(43456, "brcmfmac43456-sdio");
  23  BRCMF_FW_DEF(4354, "brcmfmac4354-sdio");
  24  BRCMF_FW_DEF(4356, "brcmfmac4356-sdio");
  25  BRCMF_FW_DEF(4373, "brcmfmac4373-sdio");
  26 @@ -642,7 +643,8 @@ static const struct brcmf_firmware_mappi
  27         BRCMF_FW_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339),
  28         BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000001, 43430A0),
  29         BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFE, 43430A1),
  30 -       BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFFC0, 43455),
  31 +       BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0x00000200, 43456),
  32 +       BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFDC0, 43455),
  33         BRCMF_FW_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354),
  34         BRCMF_FW_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356),
  35         BRCMF_FW_ENTRY(CY_CC_4373_CHIP_ID, 0xFFFFFFFF, 4373),