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

Commit 496aec57 authored by Christian Daudt's avatar Christian Daudt Committed by Kalle Valo
Browse files

brcmfmac: Add 4356 sdio support 



This adds support for the 4356-sdio wireless chip.

Signed-off-by: default avatarChristian Daudt <csd@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 2f8514b8

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

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

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4345),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4354),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4356),

	{ /* end: all zeroes */ }

};

MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids);

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

+1 −0
Original line number Diff line number Diff line
@@ -1333,6 +1333,7 @@ bool brcmf_chip_sr_capable(struct brcmf_chip *pub) 


	switch (pub->chip) {

	case BRCM_CC_4354_CHIP_ID:

	case BRCM_CC_4356_CHIP_ID:

		/* explicitly check SR engine enable bit */

		pmu_cc3_mask = BIT(2);

		/* fall-through */

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

+3 −1
Original line number Diff line number Diff line
@@ -609,6 +609,7 @@ BRCMF_FW_NVRAM_DEF(4339, "brcmfmac4339-sdio.bin", "brcmfmac4339-sdio.txt"); 
BRCMF_FW_NVRAM_DEF(43430, "brcmfmac43430-sdio.bin", "brcmfmac43430-sdio.txt");

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");



static struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {

	BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),
@@ -624,7 +625,8 @@ static struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = { 
	BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339),

	BRCMF_FW_NVRAM_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFF, 43430),

	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_4354_CHIP_ID, 0xFFFFFFFF, 4354),

	BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356)

};



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

include/linux/mmc/sdio_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#define SDIO_DEVICE_ID_BROADCOM_43430		0xa9a6

#define SDIO_DEVICE_ID_BROADCOM_4345		0x4345

#define SDIO_DEVICE_ID_BROADCOM_4354		0x4354

#define SDIO_DEVICE_ID_BROADCOM_4356		0x4356



#define SDIO_VENDOR_ID_INTEL			0x0089

#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX	0x1402