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

Commit 85a4a1c3 authored by Franky Lin's avatar Franky Lin Committed by John W. Linville
Browse files

brcmfmac: add BCM4334 support 



BCM4334 is a dualband a/b/g/n WiFi chip support 20MHz/40MHz
channels. This patch adds support for its SDIO interface.

Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6d4ef680

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_FUNC1_BLOCKSIZE		64

#define SDIO_FUNC2_BLOCKSIZE		512
@@ -52,6 +53,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)},

	{ /* 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
@@ -3885,6 +3885,8 @@ static bool brcmf_sdbrcm_chipmatch(u16 chipid) 
		return true;

	if (chipid == BCM4330_CHIP_ID)

		return true;

	if (chipid == BCM4334_CHIP_ID)

		return true;

	return false;

}

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

+17 −0
Original line number Diff line number Diff line
@@ -403,6 +403,23 @@ static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev, 
		ci->c_inf[3].cib = 0x03004211;

		ci->ramsize = 0x48000;

		break;

	case BCM4334_CHIP_ID:

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

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

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

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

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

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

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

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

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

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

		ci->c_inf[3].id = BCMA_CORE_ARM_CM3;

		ci->c_inf[3].base = 0x18003000;

		ci->c_inf[3].wrapbase = 0x18103000;

		ci->c_inf[3].cib = 0x07004211;

		ci->ramsize = 0x80000;

		break;

	default:

		brcmf_dbg(ERROR, "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
@@ -37,5 +37,6 @@ 
#define BCM4329_CHIP_ID		0x4329

#define BCM4330_CHIP_ID		0x4330

#define BCM4331_CHIP_ID		0x4331

#define BCM4334_CHIP_ID		0x4334



#endif				/* _BRCM_HW_IDS_H_ */