140 lines
5.9 KiB
Diff
140 lines
5.9 KiB
Diff
From 0ec9eb90feec4933637fbde9d5bfbc3b62aea218 Mon Sep 17 00:00:00 2001
|
|
From: Chi-Hsien Lin <chi-hsien.lin@cypress.com>
|
|
Date: Thu, 3 Aug 2017 17:37:58 +0800
|
|
Subject: [PATCH] brcmfmac: Add support for CYW4373 SDIO/USB chipset
|
|
|
|
Add support for CYW4373 SDIO/USB chipset.
|
|
CYW4373 is a 1x1 dual-band 11ac chipset with 20/40/80Mhz channel support.
|
|
It's a WiFi/BT combo device.
|
|
|
|
Signed-off-by: Chi-Hsien Lin <chi-hsien.lin@cypress.com>
|
|
Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1 +
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c | 2 ++
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 +++-
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 9 ++++++++-
|
|
drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h | 3 +++
|
|
include/linux/mmc/sdio_ids.h | 1 +
|
|
6 files changed, 18 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
|
|
@@ -1104,6 +1104,7 @@ static const struct sdio_device_id brcmf
|
|
BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43455),
|
|
BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4354),
|
|
BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4356),
|
|
+ BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_CYPRESS_4373),
|
|
{ /* end: all zeroes */ }
|
|
};
|
|
MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids);
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
|
|
@@ -690,6 +690,8 @@ static u32 brcmf_chip_tcm_rambase(struct
|
|
case BRCM_CC_4365_CHIP_ID:
|
|
case BRCM_CC_4366_CHIP_ID:
|
|
return 0x200000;
|
|
+ case CY_CC_4373_CHIP_ID:
|
|
+ return 0x160000;
|
|
default:
|
|
brcmf_err("unknown chip: %s\n", ci->pub.name);
|
|
break;
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
|
|
@@ -618,6 +618,7 @@ BRCMF_FW_NVRAM_DEF(43430A1, "brcmfmac434
|
|
BRCMF_FW_NVRAM_DEF(43455, "brcmfmac43455-sdio.bin", "brcmfmac43455-sdio.txt");
|
|
BRCMF_FW_NVRAM_DEF(4354, "brcmfmac4354-sdio.bin", "brcmfmac4354-sdio.txt");
|
|
BRCMF_FW_NVRAM_DEF(4356, "brcmfmac4356-sdio.bin", "brcmfmac4356-sdio.txt");
|
|
+BRCMF_FW_NVRAM_DEF(4373, "brcmfmac4373-sdio.bin", "brcmfmac4373-sdio.txt");
|
|
|
|
static struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
|
|
BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),
|
|
@@ -636,7 +637,8 @@ static struct brcmf_firmware_mapping brc
|
|
BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFE, 43430A1),
|
|
BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFFC0, 43455),
|
|
BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354),
|
|
- BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356)
|
|
+ BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356),
|
|
+ BRCMF_FW_NVRAM_ENTRY(CY_CC_4373_CHIP_ID, 0xFFFFFFFF, 4373)
|
|
};
|
|
|
|
static void pkt_align(struct sk_buff *p, int len, int align)
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
|
|
@@ -50,6 +50,7 @@ BRCMF_FW_DEF(43143, "brcmfmac43143.bin")
|
|
BRCMF_FW_DEF(43236B, "brcmfmac43236b.bin");
|
|
BRCMF_FW_DEF(43242A, "brcmfmac43242a.bin");
|
|
BRCMF_FW_DEF(43569, "brcmfmac43569.bin");
|
|
+BRCMF_FW_DEF(4373, "brcmfmac4373.bin");
|
|
|
|
static struct brcmf_firmware_mapping brcmf_usb_fwnames[] = {
|
|
BRCMF_FW_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),
|
|
@@ -58,7 +59,8 @@ static struct brcmf_firmware_mapping brc
|
|
BRCMF_FW_ENTRY(BRCM_CC_43238_CHIP_ID, 0x00000008, 43236B),
|
|
BRCMF_FW_ENTRY(BRCM_CC_43242_CHIP_ID, 0xFFFFFFFF, 43242A),
|
|
BRCMF_FW_ENTRY(BRCM_CC_43566_CHIP_ID, 0xFFFFFFFF, 43569),
|
|
- BRCMF_FW_ENTRY(BRCM_CC_43569_CHIP_ID, 0xFFFFFFFF, 43569)
|
|
+ BRCMF_FW_ENTRY(BRCM_CC_43569_CHIP_ID, 0xFFFFFFFF, 43569),
|
|
+ BRCMF_FW_ENTRY(CY_CC_4373_CHIP_ID, 0xFFFFFFFF, 4373)
|
|
};
|
|
|
|
#define TRX_MAGIC 0x30524448 /* "HDR0" */
|
|
@@ -1462,15 +1464,20 @@ static int brcmf_usb_reset_resume(struct
|
|
#define LINKSYS_USB_DEVICE(dev_id) \
|
|
{ USB_DEVICE(BRCM_USB_VENDOR_ID_LINKSYS, dev_id) }
|
|
|
|
+#define CYPRESS_USB_DEVICE(dev_id) \
|
|
+ { USB_DEVICE(CY_USB_VENDOR_ID_CYPRESS, dev_id) }
|
|
+
|
|
static struct usb_device_id brcmf_usb_devid_table[] = {
|
|
BRCMF_USB_DEVICE(BRCM_USB_43143_DEVICE_ID),
|
|
BRCMF_USB_DEVICE(BRCM_USB_43236_DEVICE_ID),
|
|
BRCMF_USB_DEVICE(BRCM_USB_43242_DEVICE_ID),
|
|
BRCMF_USB_DEVICE(BRCM_USB_43569_DEVICE_ID),
|
|
LINKSYS_USB_DEVICE(BRCM_USB_43235_LINKSYS_DEVICE_ID),
|
|
+ CYPRESS_USB_DEVICE(CY_USB_4373_DEVICE_ID),
|
|
{ USB_DEVICE(BRCM_USB_VENDOR_ID_LG, BRCM_USB_43242_LG_DEVICE_ID) },
|
|
/* special entry for device with firmware loaded and running */
|
|
BRCMF_USB_DEVICE(BRCM_USB_BCMFW_DEVICE_ID),
|
|
+ CYPRESS_USB_DEVICE(BRCM_USB_BCMFW_DEVICE_ID),
|
|
{ /* end: all zeroes */ }
|
|
};
|
|
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
|
|
@@ -23,6 +23,7 @@
|
|
#define BRCM_USB_VENDOR_ID_BROADCOM 0x0a5c
|
|
#define BRCM_USB_VENDOR_ID_LG 0x043e
|
|
#define BRCM_USB_VENDOR_ID_LINKSYS 0x13b1
|
|
+#define CY_USB_VENDOR_ID_CYPRESS 0x04b4
|
|
#define BRCM_PCIE_VENDOR_ID_BROADCOM PCI_VENDOR_ID_BROADCOM
|
|
|
|
/* Chipcommon Core Chip IDs */
|
|
@@ -57,6 +58,7 @@
|
|
#define BRCM_CC_4365_CHIP_ID 0x4365
|
|
#define BRCM_CC_4366_CHIP_ID 0x4366
|
|
#define BRCM_CC_4371_CHIP_ID 0x4371
|
|
+#define CY_CC_4373_CHIP_ID 0x4373
|
|
|
|
/* USB Device IDs */
|
|
#define BRCM_USB_43143_DEVICE_ID 0xbd1e
|
|
@@ -66,6 +68,7 @@
|
|
#define BRCM_USB_43242_LG_DEVICE_ID 0x3101
|
|
#define BRCM_USB_43569_DEVICE_ID 0xbd27
|
|
#define BRCM_USB_BCMFW_DEVICE_ID 0x0bdc
|
|
+#define CY_USB_4373_DEVICE_ID 0xbd29
|
|
|
|
/* PCIE Device IDs */
|
|
#define BRCM_PCIE_4350_DEVICE_ID 0x43a3
|
|
--- a/include/linux/mmc/sdio_ids.h
|
|
+++ b/include/linux/mmc/sdio_ids.h
|
|
@@ -39,6 +39,7 @@
|
|
#define SDIO_DEVICE_ID_BROADCOM_43455 0xa9bf
|
|
#define SDIO_DEVICE_ID_BROADCOM_4354 0x4354
|
|
#define SDIO_DEVICE_ID_BROADCOM_4356 0x4356
|
|
+#define SDIO_DEVICE_ID_CYPRESS_4373 0x4373
|
|
|
|
#define SDIO_VENDOR_ID_INTEL 0x0089
|
|
#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX 0x1402
|