Accueil Explorer Aide
S'inscrire Connexion
wareck
/
openwrt_lede
1
0
Fork 0
Fichiers Tickets 0 Pull Requests 0 Wiki
Aborescence: 488fc98adf
Branches Tags
openwrt_lede
/
package
/
kernel
/
mac80211
/
patches
/
326-v4.14-0001-brcmfmac-Add-support-for-CYW4373-SDIO-USB-chipset.patch

326-v4.14-0001-brcmfmac-Add-support-for-CYW4373-SDIO-USB-chipset.patch 5.9 KB
Historique Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139 
  1. From 0ec9eb90feec4933637fbde9d5bfbc3b62aea218 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Chi-Hsien Lin <chi-hsien.lin@cypress.com>
    3. 

  3. Date: Thu, 3 Aug 2017 17:37:58 +0800
    4. 

  4. Subject: [PATCH] brcmfmac: Add support for CYW4373 SDIO/USB chipset
    5. 

  5. 

  6. Add support for CYW4373 SDIO/USB chipset.
    7. 

  7. CYW4373 is a 1x1 dual-band 11ac chipset with 20/40/80Mhz channel support.
    8. 

  8. It's a WiFi/BT combo device.
    9. 

  9. 

  10. Signed-off-by: Chi-Hsien Lin <chi-hsien.lin@cypress.com>
    11. 

  11. Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com>
    12. 

  12. Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    13. 

  13. ---
    14. 

  14.  drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c     | 1 +
    15. 

  15.  drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c       | 2 ++
    16. 

  16.  drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c       | 4 +++-
    17. 

  17.  drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c        | 9 ++++++++-
    18. 

  18.  drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h | 3 +++
    19. 

  19.  include/linux/mmc/sdio_ids.h                                  | 1 +
    20. 

  20.  6 files changed, 18 insertions(+), 2 deletions(-)
    21. 

  21. 

  22. --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
    23. 

  23. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
    24. 

  24. @@ -1104,6 +1104,7 @@ static const struct sdio_device_id brcmf
    25. 

  25.  	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43455),
    26. 

  26.  	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4354),
    27. 

  27.  	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4356),
    28. 

  28. +	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_CYPRESS_4373),
    29. 

  29.  	{ /* end: all zeroes */ }
    30. 

  30.  };
    31. 

  31.  MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids);
    32. 

  32. --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
    33. 

  33. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
    34. 

  34. @@ -690,6 +690,8 @@ static u32 brcmf_chip_tcm_rambase(struct
    35. 

  35.  	case BRCM_CC_4365_CHIP_ID:
    36. 

  36.  	case BRCM_CC_4366_CHIP_ID:
    37. 

  37.  		return 0x200000;
    38. 

  38. +	case CY_CC_4373_CHIP_ID:
    39. 

  39. +		return 0x160000;
    40. 

  40.  	default:
    41. 

  41.  		brcmf_err("unknown chip: %s\n", ci->pub.name);
    42. 

  42.  		break;
    43. 

  43. --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
    44. 

  44. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
    45. 

  45. @@ -618,6 +618,7 @@ BRCMF_FW_NVRAM_DEF(43430A1, "brcmfmac434
    46. 

  46.  BRCMF_FW_NVRAM_DEF(43455, "brcmfmac43455-sdio.bin", "brcmfmac43455-sdio.txt");
    47. 

  47.  BRCMF_FW_NVRAM_DEF(4354, "brcmfmac4354-sdio.bin", "brcmfmac4354-sdio.txt");
    48. 

  48.  BRCMF_FW_NVRAM_DEF(4356, "brcmfmac4356-sdio.bin", "brcmfmac4356-sdio.txt");
    49. 

  49. +BRCMF_FW_NVRAM_DEF(4373, "brcmfmac4373-sdio.bin", "brcmfmac4373-sdio.txt");
    50. 

  50.  
    51. 

  51.  static struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
    52. 

  52.  	BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),
    53. 

  53. @@ -636,7 +637,8 @@ static struct brcmf_firmware_mapping brc
    54. 

  54.  	BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFE, 43430A1),
    55. 

  55.  	BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFFC0, 43455),
    56. 

  56.  	BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354),
    57. 

  57. -	BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356)
    58. 

  58. +	BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356),
    59. 

  59. +	BRCMF_FW_NVRAM_ENTRY(CY_CC_4373_CHIP_ID, 0xFFFFFFFF, 4373)
    60. 

  60.  };
    61. 

  61.  
    62. 

  62.  static void pkt_align(struct sk_buff *p, int len, int align)
    63. 

  63. --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
    64. 

  64. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
    65. 

  65. @@ -50,6 +50,7 @@ BRCMF_FW_DEF(43143, "brcmfmac43143.bin")
    66. 

  66.  BRCMF_FW_DEF(43236B, "brcmfmac43236b.bin");
    67. 

  67.  BRCMF_FW_DEF(43242A, "brcmfmac43242a.bin");
    68. 

  68.  BRCMF_FW_DEF(43569, "brcmfmac43569.bin");
    69. 

  69. +BRCMF_FW_DEF(4373, "brcmfmac4373.bin");
    70. 

  70.  
    71. 

  71.  static struct brcmf_firmware_mapping brcmf_usb_fwnames[] = {
    72. 

  72.  	BRCMF_FW_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),
    73. 

  73. @@ -58,7 +59,8 @@ static struct brcmf_firmware_mapping brc
    74. 

  74.  	BRCMF_FW_ENTRY(BRCM_CC_43238_CHIP_ID, 0x00000008, 43236B),
    75. 

  75.  	BRCMF_FW_ENTRY(BRCM_CC_43242_CHIP_ID, 0xFFFFFFFF, 43242A),
    76. 

  76.  	BRCMF_FW_ENTRY(BRCM_CC_43566_CHIP_ID, 0xFFFFFFFF, 43569),
    77. 

  77. -	BRCMF_FW_ENTRY(BRCM_CC_43569_CHIP_ID, 0xFFFFFFFF, 43569)
    78. 

  78. +	BRCMF_FW_ENTRY(BRCM_CC_43569_CHIP_ID, 0xFFFFFFFF, 43569),
    79. 

  79. +	BRCMF_FW_ENTRY(CY_CC_4373_CHIP_ID, 0xFFFFFFFF, 4373)
    80. 

  80.  };
    81. 

  81.  
    82. 

  82.  #define TRX_MAGIC		0x30524448	/* "HDR0" */
    83. 

  83. @@ -1462,15 +1464,20 @@ static int brcmf_usb_reset_resume(struct
    84. 

  84.  #define LINKSYS_USB_DEVICE(dev_id)	\
    85. 

  85.  	{ USB_DEVICE(BRCM_USB_VENDOR_ID_LINKSYS, dev_id) }
    86. 

  86.  
    87. 

  87. +#define CYPRESS_USB_DEVICE(dev_id)	\
    88. 

  88. +	{ USB_DEVICE(CY_USB_VENDOR_ID_CYPRESS, dev_id) }
    89. 

  89. +
    90. 

  90.  static struct usb_device_id brcmf_usb_devid_table[] = {
    91. 

  91.  	BRCMF_USB_DEVICE(BRCM_USB_43143_DEVICE_ID),
    92. 

  92.  	BRCMF_USB_DEVICE(BRCM_USB_43236_DEVICE_ID),
    93. 

  93.  	BRCMF_USB_DEVICE(BRCM_USB_43242_DEVICE_ID),
    94. 

  94.  	BRCMF_USB_DEVICE(BRCM_USB_43569_DEVICE_ID),
    95. 

  95.  	LINKSYS_USB_DEVICE(BRCM_USB_43235_LINKSYS_DEVICE_ID),
    96. 

  96. +	CYPRESS_USB_DEVICE(CY_USB_4373_DEVICE_ID),
    97. 

  97.  	{ USB_DEVICE(BRCM_USB_VENDOR_ID_LG, BRCM_USB_43242_LG_DEVICE_ID) },
    98. 

  98.  	/* special entry for device with firmware loaded and running */
    99. 

  99.  	BRCMF_USB_DEVICE(BRCM_USB_BCMFW_DEVICE_ID),
    100. 

  100. +	CYPRESS_USB_DEVICE(BRCM_USB_BCMFW_DEVICE_ID),
    101. 

  101.  	{ /* end: all zeroes */ }
    102. 

  102.  };
    103. 

  103.  
    104. 

  104. --- a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
    105. 

  105. +++ b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
    106. 

  106. @@ -23,6 +23,7 @@
    107. 

  107.  #define BRCM_USB_VENDOR_ID_BROADCOM	0x0a5c
    108. 

  108.  #define BRCM_USB_VENDOR_ID_LG		0x043e
    109. 

  109.  #define BRCM_USB_VENDOR_ID_LINKSYS	0x13b1
    110. 

  110. +#define CY_USB_VENDOR_ID_CYPRESS	0x04b4
    111. 

  111.  #define BRCM_PCIE_VENDOR_ID_BROADCOM	PCI_VENDOR_ID_BROADCOM
    112. 

  112.  
    113. 

  113.  /* Chipcommon Core Chip IDs */
    114. 

  114. @@ -57,6 +58,7 @@
    115. 

  115.  #define BRCM_CC_4365_CHIP_ID		0x4365
    116. 

  116.  #define BRCM_CC_4366_CHIP_ID		0x4366
    117. 

  117.  #define BRCM_CC_4371_CHIP_ID		0x4371
    118. 

  118. +#define CY_CC_4373_CHIP_ID		0x4373
    119. 

  119.  
    120. 

  120.  /* USB Device IDs */
    121. 

  121.  #define BRCM_USB_43143_DEVICE_ID	0xbd1e
    122. 

  122. @@ -66,6 +68,7 @@
    123. 

  123.  #define BRCM_USB_43242_LG_DEVICE_ID	0x3101
    124. 

  124.  #define BRCM_USB_43569_DEVICE_ID	0xbd27
    125. 

  125.  #define BRCM_USB_BCMFW_DEVICE_ID	0x0bdc
    126. 

  126. +#define CY_USB_4373_DEVICE_ID		0xbd29
    127. 

  127.  
    128. 

  128.  /* PCIE Device IDs */
    129. 

  129.  #define BRCM_PCIE_4350_DEVICE_ID	0x43a3
    130. 

  130. --- a/include/linux/mmc/sdio_ids.h
    131. 

  131. +++ b/include/linux/mmc/sdio_ids.h
    132. 

  132. @@ -39,6 +39,7 @@
    133. 

  133.  #define SDIO_DEVICE_ID_BROADCOM_43455		0xa9bf
    134. 

  134.  #define SDIO_DEVICE_ID_BROADCOM_4354		0x4354
    135. 

  135.  #define SDIO_DEVICE_ID_BROADCOM_4356		0x4356
    136. 

  136. +#define SDIO_DEVICE_ID_CYPRESS_4373		0x4373
    137. 

  137.  
    138. 

  138.  #define SDIO_VENDOR_ID_INTEL			0x0089
    139. 

  139.  #define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX	0x1402
    140.