345-v5.2-brcmfmac-Loading-the-correct-firmware-for-brcm43456.patch 2.0 KB

1234567891011121314151617181920212223242526272829303132333435
  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. SDIO based brcm43456 is currently misdetected as brcm43455 and the wrong
  6. firmware name is used. Correct the detection and load the correct
  7. firmware file. Chiprev for brcm43456 is "9".
  8. Signed-off-by: Ondrej Jirman <megous@megous.com>
  9. Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  10. ---
  11. drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 +++-
  12. 1 file changed, 3 insertions(+), 1 deletion(-)
  13. --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
  14. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
  15. @@ -617,6 +617,7 @@ BRCMF_FW_NVRAM_DEF(43430A0, "brcmfmac434
  16. /* Note the names are not postfixed with a1 for backward compatibility */
  17. BRCMF_FW_NVRAM_DEF(43430A1, "brcmfmac43430-sdio.bin", "brcmfmac43430-sdio.txt");
  18. BRCMF_FW_NVRAM_DEF(43455, "brcmfmac43455-sdio.bin", "brcmfmac43455-sdio.txt");
  19. +BRCMF_FW_NVRAM_DEF(43456, "brcmfmac43456-sdio.bin", "brcmfmac43456-sdio.txt");
  20. BRCMF_FW_NVRAM_DEF(4354, "brcmfmac4354-sdio.bin", "brcmfmac4354-sdio.txt");
  21. BRCMF_FW_NVRAM_DEF(4356, "brcmfmac4356-sdio.bin", "brcmfmac4356-sdio.txt");
  22. BRCMF_FW_NVRAM_DEF(4373, "brcmfmac4373-sdio.bin", "brcmfmac4373-sdio.txt");
  23. @@ -636,7 +637,8 @@ static struct brcmf_firmware_mapping brc
  24. BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339),
  25. BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000001, 43430A0),
  26. BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFE, 43430A1),
  27. - BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFFC0, 43455),
  28. + BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4345_CHIP_ID, 0x00000200, 43456),
  29. + BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFDC0, 43455),
  30. BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354),
  31. BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356),
  32. BRCMF_FW_NVRAM_ENTRY(CY_CC_4373_CHIP_ID, 0xFFFFFFFF, 4373)