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

Commit 369508c5 authored by Hante Meuleman's avatar Hante Meuleman Committed by John W. Linville
Browse files

brcmfmac: Add 43143 SDIO support. 



Added sdio device id to list of supported devices. 43143 is a new
802.11n single stream device.

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

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

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 


#define DMA_ALIGN_MASK	0x03



#define SDIO_DEVICE_ID_BROADCOM_43143	43143

#define SDIO_DEVICE_ID_BROADCOM_43241	0x4324

#define SDIO_DEVICE_ID_BROADCOM_4329	0x4329

#define SDIO_DEVICE_ID_BROADCOM_4330	0x4330
@@ -51,6 +52,7 @@ 


/* devices we support, null terminated */

static const struct sdio_device_id brcmf_sdmmc_ids[] = {

	{SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_43143)},

	{SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_43241)},

	{SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4329)},

	{SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4330)},

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

+2 −0
Original line number Diff line number Diff line
@@ -3550,6 +3550,8 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus) 


static bool brcmf_sdbrcm_chipmatch(u16 chipid)

{

	if (chipid == BCM43143_CHIP_ID)

		return true;

	if (chipid == BCM43241_CHIP_ID)

		return true;

	if (chipid == BCM4329_CHIP_ID)

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

+26 −0
Original line number Diff line number Diff line
@@ -40,6 +40,15 @@ 
#define BCM4329_CORE_ARM_BASE		0x18002000

#define BCM4329_RAMSIZE			0x48000



/* bcm43143 */

/* SDIO device core */

#define BCM43143_CORE_BUS_BASE		0x18002000

/* internal memory core */

#define BCM43143_CORE_SOCRAM_BASE	0x18004000

/* ARM Cortex M3 core, ID 0x82a */

#define BCM43143_CORE_ARM_BASE		0x18003000

#define BCM43143_RAMSIZE		0x70000



#define	SBCOREREV(sbidh) \

	((((sbidh) & SSB_IDHIGH_RCHI) >> SSB_IDHIGH_RCHI_SHIFT) | \

	  ((sbidh) & SSB_IDHIGH_RCLO))
@@ -433,6 +442,23 @@ static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev, 


	/* Address of cores for new chips should be added here */

	switch (ci->chip) {

	case BCM43143_CHIP_ID:

		ci->c_inf[0].wrapbase = ci->c_inf[0].base + 0x00100000;

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

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

		ci->c_inf[1].base = BCM43143_CORE_BUS_BASE;

		ci->c_inf[1].wrapbase = ci->c_inf[1].base + 0x00100000;

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

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

		ci->c_inf[2].base = BCM43143_CORE_SOCRAM_BASE;

		ci->c_inf[2].wrapbase = ci->c_inf[2].base + 0x00100000;

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

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

		ci->c_inf[3].base = BCM43143_CORE_ARM_BASE;

		ci->c_inf[3].wrapbase = ci->c_inf[3].base + 0x00100000;

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

		ci->ramsize = BCM43143_RAMSIZE;

		break;

	case BCM43241_CHIP_ID:

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

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

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

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 


/* Chipcommon Core Chip IDs */

#define BCM4313_CHIP_ID		0x4313

#define BCM43143_CHIP_ID	43143

#define BCM43224_CHIP_ID	43224

#define BCM43225_CHIP_ID	43225

#define BCM43235_CHIP_ID	43235