323-v4.13-0003-brcmfmac-Use-separate-firmware-for-revision-0-of-the.patch 2.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445
  1. From 1278bd149839f2281db45a910082ba143546a148 Mon Sep 17 00:00:00 2001
  2. From: Hans de Goede <hdegoede@redhat.com>
  3. Date: Fri, 16 Jun 2017 15:14:49 +0200
  4. Subject: [PATCH] brcmfmac: Use separate firmware for revision 0 of the
  5. brcm43430 chip
  6. The brcm43430 chip needs different firmware files for chip revision 0
  7. and 1. The file currently in linux-firmware is for revision 1 only.
  8. This commit makes brcmfmac request brcmfmac43430a0-sdio.bin instead
  9. of brcmfmac43430-sdio.bin for revision 0 chips.
  10. Note that the behavior for revision 1 chips is not changed, ideally those
  11. would load brcmfmac43430a1-sdio.bin, but that will break existing setups.
  12. Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  13. Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
  14. Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  15. ---
  16. drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 7 +++++--
  17. 1 file changed, 5 insertions(+), 2 deletions(-)
  18. --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
  19. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
  20. @@ -612,7 +612,9 @@ BRCMF_FW_NVRAM_DEF(43340, "brcmfmac43340
  21. BRCMF_FW_NVRAM_DEF(4335, "brcmfmac4335-sdio.bin", "brcmfmac4335-sdio.txt");
  22. BRCMF_FW_NVRAM_DEF(43362, "brcmfmac43362-sdio.bin", "brcmfmac43362-sdio.txt");
  23. BRCMF_FW_NVRAM_DEF(4339, "brcmfmac4339-sdio.bin", "brcmfmac4339-sdio.txt");
  24. -BRCMF_FW_NVRAM_DEF(43430, "brcmfmac43430-sdio.bin", "brcmfmac43430-sdio.txt");
  25. +BRCMF_FW_NVRAM_DEF(43430A0, "brcmfmac43430a0-sdio.bin", "brcmfmac43430a0-sdio.txt");
  26. +/* Note the names are not postfixed with a1 for backward compatibility */
  27. +BRCMF_FW_NVRAM_DEF(43430A1, "brcmfmac43430-sdio.bin", "brcmfmac43430-sdio.txt");
  28. BRCMF_FW_NVRAM_DEF(43455, "brcmfmac43455-sdio.bin", "brcmfmac43455-sdio.txt");
  29. BRCMF_FW_NVRAM_DEF(4354, "brcmfmac4354-sdio.bin", "brcmfmac4354-sdio.txt");
  30. BRCMF_FW_NVRAM_DEF(4356, "brcmfmac4356-sdio.bin", "brcmfmac4356-sdio.txt");
  31. @@ -630,7 +632,8 @@ static struct brcmf_firmware_mapping brc
  32. BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4335_CHIP_ID, 0xFFFFFFFF, 4335),
  33. BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, 43362),
  34. BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339),
  35. - BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFF, 43430),
  36. + BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000001, 43430A0),
  37. + BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFE, 43430A1),
  38. BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFFC0, 43455),
  39. BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354),
  40. BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356)