BACKPORT: brcmfmac: Add support for BCM4345 SDIO chipset. [chromiumos/third_party/kernel : factory-veyron-6591.B-chromeos-3.14]

[ChromeOS Commit Bot (Gerrit)]

ChromeOS Commit Bot has submitted this change and it was merged.

Change subject: BACKPORT: brcmfmac: Add support for BCM4345 SDIO chipset.
......................................................................


BACKPORT: brcmfmac: Add support for BCM4345 SDIO chipset.

These changes add support for BCM4345 SDIO chipset.

Upstream change is 9c51026509d7fd11d84e0035008e1a9768960f2b

Signed-off-by: Asifful Dayyan <sy...@broadcom.com>
Signed-off-by: Arend van Spriel <ar...@broadcom.com>
Signed-off-by: Kalle Valo <kv...@codeaurora.org>
Signed-off-by: Paul Stewart <ps...@chromium.org>

BUG=chrome-os-partner:38057
TEST=Compile only so far

Change-Id: Iea9763fdb827c0c574077d55df63461dc2ff867d
Reviewed-on: https://chromium-review.googlesource.com/260507
Reviewed-by: Syed Asifful Dayyan Rafiuddeen <sy...@broadcom.com>
Reviewed-by: Daniel Kim <de...@broadcom.com>
Reviewed-by: mukesh agrawal <qui...@chromium.org>
Commit-Queue: Paul Stewart <ps...@chromium.org>
Tested-by: Paul Stewart <ps...@chromium.org>
(cherry picked from commit af8142777655c716b97bad0cda65f30d941fd4f0)
Reviewed-on: https://chromium-review.googlesource.com/265082
Tested-by: Daniel Kim <de...@broadcom.com>
Reviewed-by: Mukesh Agrawal <qui...@google.com>
Commit-Queue: Daniel Kim <de...@broadcom.com>
---
M drivers/net/wireless-3.8/brcm80211/brcmfmac/bcmsdh.c
M drivers/net/wireless-3.8/brcm80211/brcmfmac/chip.c
M drivers/net/wireless-3.8/brcm80211/brcmfmac/dhd_sdio.c
M drivers/net/wireless-3.8/brcm80211/include/brcm_hw_ids.h
4 files changed, 12 insertions(+), 0 deletions(-)

Approvals:
Daniel Kim: Ready; Verified
Mukesh Agrawal: Looks good to me, approved



diff --git a/drivers/net/wireless-3.8/brcm80211/brcmfmac/bcmsdh.c
b/drivers/net/wireless-3.8/brcm80211/brcmfmac/bcmsdh.c
index d91e5bc..7e84fd6 100644
--- a/drivers/net/wireless-3.8/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless-3.8/brcm80211/brcmfmac/bcmsdh.c
@@ -968,6 +968,7 @@
BRCMF_SDIO_DEVICE(BRCM_SDIO_4334_DEVICE_ID),
BRCMF_SDIO_DEVICE(BRCM_SDIO_43362_DEVICE_ID),
BRCMF_SDIO_DEVICE(BRCM_SDIO_4335_4339_DEVICE_ID),
+ BRCMF_SDIO_DEVICE(BRCM_SDIO_4345_DEVICE_ID),
BRCMF_SDIO_DEVICE(BRCM_SDIO_4354_DEVICE_ID),
{ /* end: all zeroes */ }
};
diff --git a/drivers/net/wireless-3.8/brcm80211/brcmfmac/chip.c
b/drivers/net/wireless-3.8/brcm80211/brcmfmac/chip.c
index 13f5842..433133f 100644
--- a/drivers/net/wireless-3.8/brcm80211/brcmfmac/chip.c
+++ b/drivers/net/wireless-3.8/brcm80211/brcmfmac/chip.c
@@ -504,6 +504,10 @@
case BRCM_CC_43362_CHIP_ID:
ci->pub.ramsize = 0x3c000;
break;
+ case BRCM_CC_4345_CHIP_ID:
+ ci->pub.ramsize = 0xc8000;
+ ci->pub.rambase = 0x198000;
+ break;
case BRCM_CC_4339_CHIP_ID:
case BRCM_CC_4350_CHIP_ID:
case BRCM_CC_4354_CHIP_ID:
diff --git a/drivers/net/wireless-3.8/brcm80211/brcmfmac/dhd_sdio.c
b/drivers/net/wireless-3.8/brcm80211/brcmfmac/dhd_sdio.c
index 3a1a244..bc689e5 100644
--- a/drivers/net/wireless-3.8/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless-3.8/brcm80211/brcmfmac/dhd_sdio.c
@@ -614,6 +614,8 @@
#define BCM43362_NVRAM_NAME "brcm/brcmfmac43362-sdio.txt"
#define BCM4339_FIRMWARE_NAME "brcm/brcmfmac4339-sdio.bin"
#define BCM4339_NVRAM_NAME "brcm/brcmfmac4339-sdio.txt"
+#define BCM4345_FIRMWARE_NAME "brcm/brcmfmac4345-sdio.bin"
+#define BCM4345_NVRAM_NAME "brcm/brcmfmac4345-sdio.txt"
#define BCM4354_FIRMWARE_NAME "brcm/brcmfmac4354-sdio.bin"
#define BCM4354_NVRAM_NAME "brcm/brcmfmac4354-sdio.txt"

@@ -635,6 +637,8 @@
MODULE_FIRMWARE(BCM43362_NVRAM_NAME);
MODULE_FIRMWARE(BCM4339_FIRMWARE_NAME);
MODULE_FIRMWARE(BCM4339_NVRAM_NAME);
+MODULE_FIRMWARE(BCM4345_FIRMWARE_NAME);
+MODULE_FIRMWARE(BCM4345_NVRAM_NAME);
MODULE_FIRMWARE(BCM4354_FIRMWARE_NAME);
MODULE_FIRMWARE(BCM4354_NVRAM_NAME);

@@ -663,6 +667,7 @@
{ BRCM_CC_4335_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4335) },
{ BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, BRCMF_FIRMWARE_NVRAM(BCM43362) },
{ BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4339) },
+ { BRCM_CC_4345_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4345) },
{ BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4354) }
};

diff --git a/drivers/net/wireless-3.8/brcm80211/include/brcm_hw_ids.h
b/drivers/net/wireless-3.8/brcm80211/include/brcm_hw_ids.h
index 00619bf..09015e7 100644
--- a/drivers/net/wireless-3.8/brcm80211/include/brcm_hw_ids.h
+++ b/drivers/net/wireless-3.8/brcm80211/include/brcm_hw_ids.h
@@ -37,6 +37,7 @@
#define BRCM_CC_43362_CHIP_ID 43362
#define BRCM_CC_4335_CHIP_ID 0x4335
#define BRCM_CC_4339_CHIP_ID 0x4339
+#define BRCM_CC_4345_CHIP_ID 0x4345
#define BRCM_CC_4350_CHIP_ID 0x4350
#define BRCM_CC_4354_CHIP_ID 0x4354
#define BRCM_CC_4356_CHIP_ID 0x4356
@@ -54,6 +55,7 @@
#define BRCM_SDIO_4334_DEVICE_ID BRCM_CC_4334_CHIP_ID
#define BRCM_SDIO_43362_DEVICE_ID BRCM_CC_43362_CHIP_ID
#define BRCM_SDIO_4335_4339_DEVICE_ID BRCM_CC_4335_CHIP_ID
+#define BRCM_SDIO_4345_DEVICE_ID BRCM_CC_4345_CHIP_ID
#define BRCM_SDIO_4354_DEVICE_ID BRCM_CC_4354_CHIP_ID

/* USB Device IDs */

--
To view, visit https://chromium-review.googlesource.com/265082
To unsubscribe, visit https://chromium-review.googlesource.com/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iea9763fdb827c0c574077d55df63461dc2ff867d
Gerrit-PatchSet: 2
Gerrit-Project: chromiumos/third_party/kernel
Gerrit-Branch: factory-veyron-6591.B-chromeos-3.14
Gerrit-Owner: Daniel Kim <de...@broadcom.com>
Gerrit-Reviewer: ChromeOS Commit Bot <chromeos-...@chromium.org>
Gerrit-Reviewer: Daniel Kim <de...@broadcom.com>
Gerrit-Reviewer: Katie Roberts-Hoffman <kat...@chromium.org>
Gerrit-Reviewer: Mukesh Agrawal <qui...@google.com>
Gerrit-Reviewer: mukesh agrawal <qui...@chromium.org>