351-0015-brcmfmac-add-support-for-the-PCIE-devices-43525-and-.patch 3.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566
  1. From: Hante Meuleman <hante.meuleman@broadcom.com>
  2. Date: Fri, 3 Jun 2016 23:31:10 +0200
  3. Subject: [PATCH] brcmfmac: add support for the PCIE devices 43525 and 43465
  4. This patch adds support for the new PCIE devices 43525 and 43465.
  5. Reviewed-by: Arend Van Spriel <arend@broadcom.com>
  6. Reviewed-by: Franky (Zhenhui) Lin <franky.lin@broadcom.com>
  7. Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
  8. Signed-off-by: Hante Meuleman <hante.meuleman@broadcom.com>
  9. Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
  10. Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  11. ---
  12. --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
  13. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
  14. @@ -685,6 +685,8 @@ static u32 brcmf_chip_tcm_rambase(struct
  15. case BRCM_CC_43602_CHIP_ID:
  16. case BRCM_CC_4371_CHIP_ID:
  17. return 0x180000;
  18. + case BRCM_CC_43465_CHIP_ID:
  19. + case BRCM_CC_43525_CHIP_ID:
  20. case BRCM_CC_4365_CHIP_ID:
  21. case BRCM_CC_4366_CHIP_ID:
  22. return 0x200000;
  23. --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
  24. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
  25. @@ -54,21 +54,25 @@ BRCMF_FW_NVRAM_DEF(43570, "brcmfmac43570
  26. BRCMF_FW_NVRAM_DEF(4358, "brcmfmac4358-pcie.bin", "brcmfmac4358-pcie.txt");
  27. BRCMF_FW_NVRAM_DEF(4359, "brcmfmac4359-pcie.bin", "brcmfmac4359-pcie.txt");
  28. BRCMF_FW_NVRAM_DEF(4365B, "brcmfmac4365b-pcie.bin", "brcmfmac4365b-pcie.txt");
  29. +BRCMF_FW_NVRAM_DEF(4365C, "brcmfmac4365c-pcie.bin", "brcmfmac4365c-pcie.txt");
  30. BRCMF_FW_NVRAM_DEF(4366B, "brcmfmac4366b-pcie.bin", "brcmfmac4366b-pcie.txt");
  31. BRCMF_FW_NVRAM_DEF(4366C, "brcmfmac4366c-pcie.bin", "brcmfmac4366c-pcie.txt");
  32. BRCMF_FW_NVRAM_DEF(4371, "brcmfmac4371-pcie.bin", "brcmfmac4371-pcie.txt");
  33. static struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
  34. BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43602_CHIP_ID, 0xFFFFFFFF, 43602),
  35. + BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43465_CHIP_ID, 0xFFFFFFF0, 4366C),
  36. BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4350_CHIP_ID, 0x000000FF, 4350C),
  37. BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4350_CHIP_ID, 0xFFFFFF00, 4350),
  38. + BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43525_CHIP_ID, 0xFFFFFFF0, 4365C),
  39. BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356),
  40. BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43567_CHIP_ID, 0xFFFFFFFF, 43570),
  41. BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43569_CHIP_ID, 0xFFFFFFFF, 43570),
  42. BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43570_CHIP_ID, 0xFFFFFFFF, 43570),
  43. BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4358_CHIP_ID, 0xFFFFFFFF, 4358),
  44. BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4359_CHIP_ID, 0xFFFFFFFF, 4359),
  45. - BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4365_CHIP_ID, 0xFFFFFFFF, 4365B),
  46. + BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4365_CHIP_ID, 0x0000000F, 4365B),
  47. + BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4365_CHIP_ID, 0xFFFFFFF0, 4365C),
  48. BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4366_CHIP_ID, 0x0000000F, 4366B),
  49. BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4366_CHIP_ID, 0xFFFFFFF0, 4366C),
  50. BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4371_CHIP_ID, 0xFFFFFFFF, 4371),
  51. --- a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
  52. +++ b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
  53. @@ -40,7 +40,9 @@
  54. #define BRCM_CC_4339_CHIP_ID 0x4339
  55. #define BRCM_CC_43430_CHIP_ID 43430
  56. #define BRCM_CC_4345_CHIP_ID 0x4345
  57. +#define BRCM_CC_43465_CHIP_ID 43465
  58. #define BRCM_CC_4350_CHIP_ID 0x4350
  59. +#define BRCM_CC_43525_CHIP_ID 43525
  60. #define BRCM_CC_4354_CHIP_ID 0x4354
  61. #define BRCM_CC_4356_CHIP_ID 0x4356
  62. #define BRCM_CC_43566_CHIP_ID 43566