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

Commit 634faf36 authored by Arend Van Spriel's avatar Arend Van Spriel Committed by Kalle Valo
Browse files

brcmfmac: add support for bcm4339 chip with modalias sdio:c00v02D0d4339 



The driver already supports the bcm4339 chipset but only for the variant
that shares the same modalias as the bcm4335, ie. sdio:c00v02D0d4335.
It turns out that there are also bcm4339 devices out there that have a
more distiguishable modalias sdio:c00v02D0d4339.

Reported-by: default avatarSteve deRosier <derosier@gmail.com>
Reviewed-by: default avatarHante Meuleman <hante.meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Reviewed-by: default avatarFranky Lin <franky.lin@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent d43af505

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

+1 −0
Original line number Diff line number Diff line
@@ -1101,6 +1101,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_4339),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43430),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4345),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4354),

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

+2 −1
Original line number Diff line number Diff line
@@ -3757,7 +3757,8 @@ static u32 brcmf_sdio_buscore_read32(void *ctx, u32 addr) 
	u32 val, rev;



	val = brcmf_sdiod_regrl(sdiodev, addr, NULL);

	if (sdiodev->func[0]->device == SDIO_DEVICE_ID_BROADCOM_4335_4339 &&

	if ((sdiodev->func[0]->device == SDIO_DEVICE_ID_BROADCOM_4335_4339 ||

	     sdiodev->func[0]->device == SDIO_DEVICE_ID_BROADCOM_4339) &&

	    addr == CORE_CC_REG(SI_ENUM_BASE, chipid)) {

		rev = (val & CID_REV_MASK) >> CID_REV_SHIFT;

		if (rev >= 2) {

include/linux/mmc/sdio_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#define SDIO_DEVICE_ID_BROADCOM_43340		0xa94c

#define SDIO_DEVICE_ID_BROADCOM_43341		0xa94d

#define SDIO_DEVICE_ID_BROADCOM_4335_4339	0x4335

#define SDIO_DEVICE_ID_BROADCOM_4339		0x4339

#define SDIO_DEVICE_ID_BROADCOM_43362		0xa962

#define SDIO_DEVICE_ID_BROADCOM_43430		0xa9a6

#define SDIO_DEVICE_ID_BROADCOM_4345		0x4345