Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c510265 authored by Syed Asifful Dayyan's avatar Syed Asifful Dayyan Committed by Kalle Valo
Browse files

brcmfmac: Add support for BCM4345 SDIO chipset. 



These changes add support for BCM4345 SDIO chipset.

Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarArend Van Spriel <arend@broadcom.com>
Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Reviewed-by: default avatarDaniel (Deognyoun) Kim <dekim@broadcom.com>
Signed-off-by: default avatarSyed Asifful Dayyan <syedd@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent d375bc8a

drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c

+1 −0
Original line number Diff line number Diff line
@@ -1096,6 +1096,7 @@ static const struct sdio_device_id brcmf_sdmmc_ids[] = { 
	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43341),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43362),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4335_4339),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4345),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4354),

	{ /* end: all zeroes */ }

};

drivers/net/wireless/brcm80211/brcmfmac/chip.c

+4 −0
Original line number Diff line number Diff line
@@ -491,6 +491,10 @@ static void brcmf_chip_get_raminfo(struct brcmf_chip_priv *ci) 
	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_4354_CHIP_ID:

	case BRCM_CC_4356_CHIP_ID:

drivers/net/wireless/brcm80211/brcmfmac/sdio.c

+5 −0
Original line number Diff line number Diff line
@@ -617,6 +617,8 @@ static const struct sdiod_drive_str sdiod_drvstr_tab2_3v3[] = { 
#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"
@@ -640,6 +642,8 @@ MODULE_FIRMWARE(BCM43362_FIRMWARE_NAME); 
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);
@@ -669,6 +673,7 @@ static const struct brcmf_firmware_names brcmf_fwname_data[] = { 
	{ 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) }

};

drivers/net/wireless/brcm80211/include/brcm_hw_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -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_4354_CHIP_ID		0x4354

#define BRCM_CC_4356_CHIP_ID		0x4356

#define BRCM_CC_43566_CHIP_ID		43566

include/linux/mmc/sdio_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#define SDIO_DEVICE_ID_BROADCOM_43341		0xa94d

#define SDIO_DEVICE_ID_BROADCOM_4335_4339	0x4335

#define SDIO_DEVICE_ID_BROADCOM_43362		0xa962

#define SDIO_DEVICE_ID_BROADCOM_4345		0x4345

#define SDIO_DEVICE_ID_BROADCOM_4354		0x4354



#define SDIO_VENDOR_ID_INTEL			0x0089