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

Commit db003484 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by John W. Linville
Browse files

brcmsmac: handle non PCI devices in the phy code 



Some code in write_{radio,radio}_reg() should just be run if this is a
pci based device. Add the condition again which was removed in commit:
commit 821e4e93
Author: Roland Vossen <rvossen@broadcom.com>
Date:   Mon Aug 8 15:58:58 2011 +0200

    staging: brcm80211: removed unused bus code from softmac

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Acked-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ae0146f9

drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c

+8 −2
Original line number Diff line number Diff line
@@ -198,6 +198,8 @@ u16 read_radio_reg(struct brcms_phy *pi, u16 addr) 


void write_radio_reg(struct brcms_phy *pi, u16 addr, u16 val)

{

	struct si_info *sii = container_of(pi->sh->sih, struct si_info, pub);



	if ((D11REV_GE(pi->sh->corerev, 24)) ||

	    (D11REV_IS(pi->sh->corerev, 22)

	     && (pi->pubpi.phy_type != PHY_TYPE_SSN))) {
@@ -209,7 +211,8 @@ void write_radio_reg(struct brcms_phy *pi, u16 addr, u16 val) 
		bcma_write16(pi->d11core, D11REGOFFS(phy4wdatalo), val);

	}



	if (++pi->phy_wreg >= pi->phy_wreg_limit) {

	if ((sii->icbus->hosttype == BCMA_HOSTTYPE_PCI) &&

	    (++pi->phy_wreg >= pi->phy_wreg_limit)) {

		(void)bcma_read32(pi->d11core, D11REGOFFS(maccontrol));

		pi->phy_wreg = 0;

	}
@@ -294,8 +297,11 @@ void write_phy_reg(struct brcms_phy *pi, u16 addr, u16 val) 
	if (addr == 0x72)

		(void)bcma_read16(pi->d11core, D11REGOFFS(phyregdata));

#else

	struct si_info *sii = container_of(pi->sh->sih, struct si_info, pub);



	bcma_write32(pi->d11core, D11REGOFFS(phyregaddr), addr | (val << 16));

	if (++pi->phy_wreg >= pi->phy_wreg_limit) {

	if ((sii->icbus->hosttype == BCMA_HOSTTYPE_PCI) &&

	    (++pi->phy_wreg >= pi->phy_wreg_limit)) {

		pi->phy_wreg = 0;

		(void)bcma_read16(pi->d11core, D11REGOFFS(phyversion));

	}