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

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

brcmsmac: remove ai_gpiocontrol() 



This is now done by calling bcma_chipco_gpio_control().

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

drivers/net/wireless/brcm80211/brcmsmac/aiutils.c

+0 −9
Original line number Diff line number Diff line
@@ -856,15 +856,6 @@ int ai_pci_fixcfg(struct si_pub *sih) 
	return 0;

}



/* mask&set gpiocontrol bits */

u32 ai_gpiocontrol(struct si_pub *sih, u32 mask, u32 val, u8 priority)

{

	uint regoff;



	regoff = offsetof(struct chipcregs, gpiocontrol);

	return ai_cc_reg(sih, regoff, mask, val);

}



/* Enable BT-COEX & Ex-PA for 4313 */

void ai_epa_4313war(struct si_pub *sih)

{

drivers/net/wireless/brcm80211/brcmsmac/aiutils.h

+0 −2
Original line number Diff line number Diff line
@@ -200,8 +200,6 @@ extern void ai_clkctl_init(struct si_pub *sih); 
extern u16 ai_clkctl_fast_pwrup_delay(struct si_pub *sih);

extern bool ai_clkctl_cc(struct si_pub *sih, uint mode);

extern bool ai_deviceremoved(struct si_pub *sih);

extern u32 ai_gpiocontrol(struct si_pub *sih, u32 mask, u32 val,

			     u8 priority);



extern void ai_pci_down(struct si_pub *sih);

extern void ai_pci_up(struct si_pub *sih);

drivers/net/wireless/brcm80211/brcmsmac/main.c

+1 −1
Original line number Diff line number Diff line
@@ -2208,7 +2208,7 @@ static void brcms_c_gpio_init(struct brcms_c_info *wlc) 
		gm |= gc |= BOARD_GPIO_PACTRL;



	/* apply to gpiocontrol register */

	ai_gpiocontrol(wlc_hw->sih, gm, gc, GPIO_DRV_PRIORITY);

	bcma_chipco_gpio_control(&wlc_hw->d11core->bus->drv_cc, gm, gc);

}



static void brcms_ucode_write(struct brcms_hardware *wlc_hw,

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

+1 −1
Original line number Diff line number Diff line
@@ -21343,7 +21343,7 @@ void wlc_phy_antsel_init(struct brcms_phy_pub *ppi, bool lut_init) 
		write_phy_reg(pi, 0xc8, 0x0);

		write_phy_reg(pi, 0xc9, 0x0);













		ai_gpiocontrol(pi->sh->sih, mask, mask, GPIO_DRV_PRIORITY);













		bcma_chipco_gpio_control(&pi->d11core->bus->drv_cc, mask, mask);





























		mc = bcma_read32(pi->d11core, D11REGOFFS(maccontrol));















		mc &= ~MCTL_GPOUT_SEL_MASK;