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

Commit 6a1c7483 authored by Franky Lin's avatar Franky Lin Committed by John W. Linville
Browse files

brcmfmac: add BCM4335 sdio interface support 



BCM4335 is an a/b/g/n/ac WiFi chip that supports up to 80MHz channel. This patch
adds support for this chip through SDIO interface.

Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarPiotr Haber <phaber@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1e9ab4dd

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

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#define SDIO_DEVICE_ID_BROADCOM_4329	0x4329

#define SDIO_DEVICE_ID_BROADCOM_4330	0x4330

#define SDIO_DEVICE_ID_BROADCOM_4334	0x4334

#define SDIO_DEVICE_ID_BROADCOM_4335	0x4335



#define SDIO_FUNC1_BLOCKSIZE		64

#define SDIO_FUNC2_BLOCKSIZE		512
@@ -54,6 +55,7 @@ static const struct sdio_device_id brcmf_sdmmc_ids[] = { 
	{SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4329)},

	{SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4330)},

	{SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4334)},

	{SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4335)},

	{ /* end: all zeroes */ },

};

MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids);

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

+2 −0
Original line number Diff line number Diff line
@@ -3558,6 +3558,8 @@ static bool brcmf_sdbrcm_chipmatch(u16 chipid) 
		return true;

	if (chipid == BCM4334_CHIP_ID)

		return true;

	if (chipid == BCM4335_CHIP_ID)

		return true;

	return false;

}

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

+14 −0
Original line number Diff line number Diff line
@@ -493,6 +493,20 @@ static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev, 
		ci->c_inf[3].cib = 0x07004211;

		ci->ramsize = 0x80000;

		break;

	case BCM4335_CHIP_ID:

		ci->c_inf[0].wrapbase = 0x18100000;

		ci->c_inf[0].cib = 0x2b084411;

		ci->c_inf[1].id = BCMA_CORE_SDIO_DEV;

		ci->c_inf[1].base = 0x18005000;

		ci->c_inf[1].wrapbase = 0x18105000;

		ci->c_inf[1].cib = 0x0f004211;

		ci->c_inf[2].id = BCMA_CORE_ARM_CR4;

		ci->c_inf[2].base = 0x18002000;

		ci->c_inf[2].wrapbase = 0x18102000;

		ci->c_inf[2].cib = 0x01084411;

		ci->ramsize = 0xc0000;

		ci->rambase = 0x180000;

		break;

	default:

		brcmf_err("chipid 0x%x is not supported\n", ci->chip);

		return -ENODEV;

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

+1 −0
Original line number Diff line number Diff line
@@ -39,5 +39,6 @@ 
#define BCM4330_CHIP_ID		0x4330

#define BCM4331_CHIP_ID		0x4331

#define BCM4334_CHIP_ID		0x4334

#define BCM4335_CHIP_ID		0x4335



#endif				/* _BRCM_HW_IDS_H_ */