brcm80211: Add support for brcm4371

PATCH Applied Eric Caruso 3 participants 3 messages Oct 14, 2015 – Oct 21, 2015 Networking drivers (wireless)

lore

Share & tools

lore

Eric Caruso

author

2015-10-14 19:34 UTC #0 lore raw

PATCH v3 1/1 brcm80211: Add support for brcm4371

This is a new Broadcom chip and we should be able to recognize it.

Signed-off-by Eric Caruso <[email protected]>

---
v2: rebased.
v3: added back break that got lost in v2.

 drivers/net/wireless/brcm80211/brcmfmac/chip.c       | 1 +
 drivers/net/wireless/brcm80211/brcmfmac/pcie.c       | 9 +++++++++
 drivers/net/wireless/brcm80211/include/brcm_hw_ids.h | 2 ++
 3 files changed, 12 insertions(+)

drivers/net/wireless/brcm80211/brcmfmac/chip.c +1 -0

index ffc3ace..f04833d 100644
@@ -682,6 +682,7 @@ static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci)
 	case BRCM_CC_43570_CHIP_ID:
 	case BRCM_CC_4358_CHIP_ID:
 	case BRCM_CC_43602_CHIP_ID:
+	case BRCM_CC_4371_CHIP_ID:
 		return 0x180000;
 	case BRCM_CC_4365_CHIP_ID:
 	case BRCM_CC_4366_CHIP_ID:

drivers/net/wireless/brcm80211/brcmfmac/pcie.c +9 -0

index 30baf35..ebd7f2d 100644
@@ -59,6 +59,8 @@ enum brcmf_pcie_state {
 #define BRCMF_PCIE_4365_NVRAM_NAME		"brcm/brcmfmac4365b-pcie.txt"
 #define BRCMF_PCIE_4366_FW_NAME			"brcm/brcmfmac4366b-pcie.bin"
 #define BRCMF_PCIE_4366_NVRAM_NAME		"brcm/brcmfmac4366b-pcie.txt"
+#define BRCMF_PCIE_4371_FW_NAME			"brcm/brcmfmac4371-pcie.bin"
+#define BRCMF_PCIE_4371_NVRAM_NAME		"brcm/brcmfmac4371-pcie.txt"
 
 #define BRCMF_PCIE_FW_UP_TIMEOUT		2000 /* msec */

@@ -212,6 +214,8 @@ MODULE_FIRMWARE(BRCMF_PCIE_4365_FW_NAME);
 MODULE_FIRMWARE(BRCMF_PCIE_4365_NVRAM_NAME);
 MODULE_FIRMWARE(BRCMF_PCIE_4366_FW_NAME);
 MODULE_FIRMWARE(BRCMF_PCIE_4366_NVRAM_NAME);
+MODULE_FIRMWARE(BRCMF_PCIE_4371_FW_NAME);
+MODULE_FIRMWARE(BRCMF_PCIE_4371_NVRAM_NAME);
 
 
 struct brcmf_pcie_console {

@@ -1456,6 +1460,10 @@ static int brcmf_pcie_get_fwnames(struct brcmf_pciedev_info *devinfo)
 		fw_name = BRCMF_PCIE_4366_FW_NAME;
 		nvram_name = BRCMF_PCIE_4366_NVRAM_NAME;
 		break;
+	case BRCM_CC_4371_CHIP_ID:
+		fw_name = BRCMF_PCIE_4371_FW_NAME;
+		nvram_name = BRCMF_PCIE_4371_NVRAM_NAME;
+		break;
 	default:
 		brcmf_err("Unsupported chip 0x%04x\n", devinfo->ci->chip);
 		return -ENODEV;

@@ -1995,6 +2003,7 @@ static struct pci_device_id brcmf_pcie_devid_table[] = {
 	BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_DEVICE_ID),
 	BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_2G_DEVICE_ID),
 	BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_5G_DEVICE_ID),
+	BRCMF_PCIE_DEVICE(BRCM_PCIE_4371_DEVICE_ID),
 	{ /* end: all zeroes */ }
 };

drivers/net/wireless/brcm80211/include/brcm_hw_ids.h +2 -0

index d823734..aa06ea2 100644
@@ -50,6 +50,7 @@
 #define BRCM_CC_43602_CHIP_ID		43602
 #define BRCM_CC_4365_CHIP_ID		0x4365
 #define BRCM_CC_4366_CHIP_ID		0x4366
+#define BRCM_CC_4371_CHIP_ID		0x4371
 
 /* USB Device IDs */
 #define BRCM_USB_43143_DEVICE_ID	0xbd1e

@@ -75,6 +76,7 @@
 #define BRCM_PCIE_4366_DEVICE_ID	0x43c3
 #define BRCM_PCIE_4366_2G_DEVICE_ID	0x43c4
 #define BRCM_PCIE_4366_5G_DEVICE_ID	0x43c5
+#define BRCM_PCIE_4371_DEVICE_ID	0x440d
 
 
 /* brcmsmac IDs */

Signature · 1 line

2.6.0.rc2.230.g3dd15c0

Arend van Spriel

Acked-by on v3 1/1

2015-10-15 09:39 UTC #1 lore raw

Quoted 1 line · Eric Caruso

This is a new Broadcom chip and we should be able to recognize it.

Acked-by Arend van Spriel <[email protected]>

Quoted 84 lines

Signed-off-by Eric Caruso <[email protected]>

---
v2: rebased.
v3: added back break that got lost in v2.

  drivers/net/wireless/brcm80211/brcmfmac/chip.c       | 1 +
  drivers/net/wireless/brcm80211/brcmfmac/pcie.c       | 9 +++++++++
  drivers/net/wireless/brcm80211/include/brcm_hw_ids.h | 2 ++
  3 files changed, 12 insertions(+)

drivers/net/wireless/brcm80211/brcmfmac/chip.c +1 -0

index ffc3ace..f04833d 100644
@@ -682,6 +682,7 @@ static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci)
  	case BRCM_CC_43570_CHIP_ID:
  	case BRCM_CC_4358_CHIP_ID:
  	case BRCM_CC_43602_CHIP_ID:
+	case BRCM_CC_4371_CHIP_ID:
  		return 0x180000;
  	case BRCM_CC_4365_CHIP_ID:
  	case BRCM_CC_4366_CHIP_ID:

drivers/net/wireless/brcm80211/brcmfmac/pcie.c +9 -0

index 30baf35..ebd7f2d 100644
@@ -59,6 +59,8 @@ enum brcmf_pcie_state {
  #define BRCMF_PCIE_4365_NVRAM_NAME		"brcm/brcmfmac4365b-pcie.txt"
  #define BRCMF_PCIE_4366_FW_NAME			"brcm/brcmfmac4366b-pcie.bin"
  #define BRCMF_PCIE_4366_NVRAM_NAME		"brcm/brcmfmac4366b-pcie.txt"
+#define BRCMF_PCIE_4371_FW_NAME			"brcm/brcmfmac4371-pcie.bin"
+#define BRCMF_PCIE_4371_NVRAM_NAME		"brcm/brcmfmac4371-pcie.txt"
 
  #define BRCMF_PCIE_FW_UP_TIMEOUT		2000 /* msec */

@@ -212,6 +214,8 @@ MODULE_FIRMWARE(BRCMF_PCIE_4365_FW_NAME);
  MODULE_FIRMWARE(BRCMF_PCIE_4365_NVRAM_NAME);
  MODULE_FIRMWARE(BRCMF_PCIE_4366_FW_NAME);
  MODULE_FIRMWARE(BRCMF_PCIE_4366_NVRAM_NAME);
+MODULE_FIRMWARE(BRCMF_PCIE_4371_FW_NAME);
+MODULE_FIRMWARE(BRCMF_PCIE_4371_NVRAM_NAME);
 
 
  struct brcmf_pcie_console {

@@ -1456,6 +1460,10 @@ static int brcmf_pcie_get_fwnames(struct brcmf_pciedev_info *devinfo)
  		fw_name = BRCMF_PCIE_4366_FW_NAME;
  		nvram_name = BRCMF_PCIE_4366_NVRAM_NAME;
  		break;
+	case BRCM_CC_4371_CHIP_ID:
+		fw_name = BRCMF_PCIE_4371_FW_NAME;
+		nvram_name = BRCMF_PCIE_4371_NVRAM_NAME;
+		break;
  	default:
  		brcmf_err("Unsupported chip 0x%04x\n", devinfo->ci->chip);
  		return -ENODEV;

@@ -1995,6 +2003,7 @@ static struct pci_device_id brcmf_pcie_devid_table[] = {
  	BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_DEVICE_ID),
  	BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_2G_DEVICE_ID),
  	BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_5G_DEVICE_ID),
+	BRCMF_PCIE_DEVICE(BRCM_PCIE_4371_DEVICE_ID),
  	{ /* end: all zeroes */ }
  };

drivers/net/wireless/brcm80211/include/brcm_hw_ids.h +2 -0

index d823734..aa06ea2 100644
@@ -50,6 +50,7 @@
  #define BRCM_CC_43602_CHIP_ID		43602
  #define BRCM_CC_4365_CHIP_ID		0x4365
  #define BRCM_CC_4366_CHIP_ID		0x4366
+#define BRCM_CC_4371_CHIP_ID		0x4371
 
  /* USB Device IDs */
  #define BRCM_USB_43143_DEVICE_ID	0xbd1e

@@ -75,6 +76,7 @@
  #define BRCM_PCIE_4366_DEVICE_ID	0x43c3
  #define BRCM_PCIE_4366_2G_DEVICE_ID	0x43c4
  #define BRCM_PCIE_4366_5G_DEVICE_ID	0x43c5
+#define BRCM_PCIE_4371_DEVICE_ID	0x440d
 
 
  /* brcmsmac IDs */

Kalle Valo

Applied

2015-10-21 07:58 UTC #2 lore raw

In reply to Eric Caruso

Quoted 5 lines

This is a new Broadcom chip and we should be able to recognize it.
Signed-off-by Eric Caruso <[email protected]>
Acked-by Arend van Spriel <[email protected]>

Thanks, applied to wireless-drivers-next.git.

Kalle Valo