Commit be376df7 authored by Marek Vasut's avatar Marek Vasut Committed by Kalle Valo
Browse files

wifi: brcmfmac: add 43439 SDIO ids and initialization 



Add HW and SDIO ids for use with the muRata 1YN (Cypress CYW43439).
Add the firmware mapping structures for the CYW43439 chipset.
The 43439 needs some things setup similar to the 43430 chipset.

Signed-off-by: default avatarMarek Vasut <marex@denx.de>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220827024903.617294-1-marex@denx.de
parent 98d3f063

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

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

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43012),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43439),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43752),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_89359),

	{ /* end: all zeroes */ }

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

+4 −1
Original line number Diff line number Diff line
@@ -641,6 +641,7 @@ static void brcmf_chip_socram_ramsize(struct brcmf_core_priv *sr, u32 *ramsize, 
			*srsize = (32 * 1024);

		break;

	case BRCM_CC_43430_CHIP_ID:

	case CY_CC_43439_CHIP_ID:

		/* assume sr for now as we can not check

		 * firmware sr capability at this point.

		 */
@@ -1258,7 +1259,8 @@ brcmf_chip_cm3_set_passive(struct brcmf_chip_priv *chip) 
	brcmf_chip_resetcore(core, 0, 0, 0);



	/* disable bank #3 remap for this device */

	if (chip->pub.chip == BRCM_CC_43430_CHIP_ID) {

	if (chip->pub.chip == BRCM_CC_43430_CHIP_ID ||

	    chip->pub.chip == CY_CC_43439_CHIP_ID) {

		sr = container_of(core, struct brcmf_core_priv, pub);

		brcmf_chip_core_write32(sr, SOCRAMREGOFFS(bankidx), 3);

		brcmf_chip_core_write32(sr, SOCRAMREGOFFS(bankpda), 0);
@@ -1416,6 +1418,7 @@ bool brcmf_chip_sr_capable(struct brcmf_chip *pub) 
		reg = chip->ops->read32(chip->ctx, addr);

		return (reg & pmu_cc3_mask) != 0;

	case BRCM_CC_43430_CHIP_ID:

	case CY_CC_43439_CHIP_ID:

		addr = CORE_CC_REG(base, sr_control1);

		reg = chip->ops->read32(chip->ctx, addr);

		return reg != 0;

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

+2 −1
Original line number Diff line number Diff line
@@ -249,7 +249,8 @@ void brcmf_feat_attach(struct brcmf_pub *drvr) 
	memset(&gscan_cfg, 0, sizeof(gscan_cfg));

	if (drvr->bus_if->chip != BRCM_CC_43430_CHIP_ID &&

	    drvr->bus_if->chip != BRCM_CC_4345_CHIP_ID &&

	    drvr->bus_if->chip != BRCM_CC_43454_CHIP_ID)

	    drvr->bus_if->chip != BRCM_CC_43454_CHIP_ID &&

	    drvr->bus_if->chip != CY_CC_43439_CHIP_ID)

		brcmf_feat_iovar_data_set(ifp, BRCMF_FEAT_GSCAN,

					  "pfn_gscan_cfg",

					  &gscan_cfg, sizeof(gscan_cfg));

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

+2 −0
Original line number Diff line number Diff line
@@ -618,6 +618,7 @@ BRCMF_FW_DEF(43430A0, "brcmfmac43430a0-sdio"); 
/* Note the names are not postfixed with a1 for backward compatibility */

BRCMF_FW_CLM_DEF(43430A1, "brcmfmac43430-sdio");

BRCMF_FW_DEF(43430B0, "brcmfmac43430b0-sdio");

BRCMF_FW_CLM_DEF(43439, "brcmfmac43439-sdio");

BRCMF_FW_CLM_DEF(43455, "brcmfmac43455-sdio");

BRCMF_FW_DEF(43456, "brcmfmac43456-sdio");

BRCMF_FW_CLM_DEF(4354, "brcmfmac4354-sdio");
@@ -657,6 +658,7 @@ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = { 
	BRCMF_FW_ENTRY(BRCM_CC_4359_CHIP_ID, 0xFFFFFFFF, 4359),

	BRCMF_FW_ENTRY(CY_CC_4373_CHIP_ID, 0xFFFFFFFF, 4373),

	BRCMF_FW_ENTRY(CY_CC_43012_CHIP_ID, 0xFFFFFFFF, 43012),

	BRCMF_FW_ENTRY(CY_CC_43439_CHIP_ID, 0xFFFFFFFF, 43439),

	BRCMF_FW_ENTRY(CY_CC_43752_CHIP_ID, 0xFFFFFFFF, 43752)

};

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

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#define BRCM_CC_4371_CHIP_ID		0x4371

#define CY_CC_4373_CHIP_ID		0x4373

#define CY_CC_43012_CHIP_ID		43012

#define CY_CC_43439_CHIP_ID		43439

#define CY_CC_43752_CHIP_ID		43752



/* USB Device IDs */