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

Commit 5b45e54e authored by Franky Lin's avatar Franky Lin Committed by John W. Linville
Browse files

brcm80211: fmac: abstract chip buscore setup function 



This patch is part of the abstracting chip backplane handle code
series.

Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@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 e63ac6b8

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

+33 −20
Original line number Diff line number Diff line
@@ -83,26 +83,6 @@ static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev, 
		return -ENODEV;

	}



	regdata = brcmf_sdcard_reg_read(sdiodev,

		CORE_SB(ci->cccorebase, sbidhigh), 4);

	ci->ccrev = SBCOREREV(regdata);



	regdata = brcmf_sdcard_reg_read(sdiodev,

		CORE_CC_REG(ci->cccorebase, pmucapabilities), 4);

	ci->pmurev = regdata & PCAP_REV_MASK;



	regdata = brcmf_sdcard_reg_read(sdiodev,

					CORE_SB(ci->buscorebase, sbidhigh), 4);

	ci->buscorerev = SBCOREREV(regdata);

	ci->buscoretype = (regdata & SBIDH_CC_MASK) >> SBIDH_CC_SHIFT;



	brcmf_dbg(INFO, "ccrev=%d, pmurev=%d, buscore rev/type=%d/0x%x\n",

		  ci->ccrev, ci->pmurev, ci->buscorerev, ci->buscoretype);



	/* get chipcommon capabilites */

	ci->cccaps = brcmf_sdcard_reg_read(sdiodev,

		CORE_CC_REG(ci->cccorebase, capabilities), 4);



	return 0;

}
@@ -154,6 +134,37 @@ brcmf_sdio_chip_buscoreprep(struct brcmf_sdio_dev *sdiodev) 
	return 0;

}



static void

brcmf_sdio_chip_buscoresetup(struct brcmf_sdio_dev *sdiodev,

			     struct chip_info *ci)

{

	u32 regdata;



	/* get chipcommon rev */

	regdata = brcmf_sdcard_reg_read(sdiodev,

		CORE_SB(ci->cccorebase, sbidhigh), 4);

	ci->ccrev = SBCOREREV(regdata);



	/* get chipcommon capabilites */

	ci->cccaps = brcmf_sdcard_reg_read(sdiodev,

		CORE_CC_REG(ci->cccorebase, capabilities), 4);



	/* get pmu caps & rev */

	if (ci->cccaps & CC_CAP_PMU) {

		ci->pmucaps = brcmf_sdcard_reg_read(sdiodev,

			CORE_CC_REG(ci->cccorebase, pmucapabilities), 4);

		ci->pmurev = ci->pmucaps & PCAP_REV_MASK;

	}



	regdata = brcmf_sdcard_reg_read(sdiodev,

					CORE_SB(ci->buscorebase, sbidhigh), 4);

	ci->buscorerev = SBCOREREV(regdata);

	ci->buscoretype = (regdata & SBIDH_CC_MASK) >> SBIDH_CC_SHIFT;



	brcmf_dbg(INFO, "ccrev=%d, pmurev=%d, buscore rev/type=%d/0x%x\n",

		  ci->ccrev, ci->pmurev, ci->buscorerev, ci->buscoretype);

}



int brcmf_sdio_chip_attach(struct brcmf_sdio_dev *sdiodev,

			   struct chip_info *ci, u32 regs)

{
@@ -167,5 +178,7 @@ int brcmf_sdio_chip_attach(struct brcmf_sdio_dev *sdiodev, 
	if (ret != 0)

		return ret;



	brcmf_sdio_chip_buscoresetup(sdiodev, ci);



	return ret;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ struct chip_info { 
	u32 ramcorebase;

	u32 armcorebase;

	u32 pmurev;

	u32 pmucaps;

	u32 ramsize;

};