Commit 32cb68bf authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcm80211: smac: remove obsolete srom variables from n-phy 



The n-phy requested some srom variables that are no longer needed
and consequently not present in the srom revision 8 and higher that
this driver support. This code has been removed from the n-phy.

Reviewed-by: default avatarAlwin Beukers <alwin@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c261bdf8

drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h

+0 −5
Original line number Diff line number Diff line
@@ -774,11 +774,6 @@ struct brcms_phy { 
	s16 nphy_noise_win[PHY_CORE_MAX][PHY_NOISE_WINDOW_SZ];

	u8 nphy_noise_index;



	u8 nphy_txpid2g[PHY_CORE_NUM_2];

	u8 nphy_txpid5g[PHY_CORE_NUM_2];

	u8 nphy_txpid5gl[PHY_CORE_NUM_2];

	u8 nphy_txpid5gh[PHY_CORE_NUM_2];



	bool nphy_gain_boost;

	bool nphy_elna_gain_config;

	u16 old_bphy_test;

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

+2 −35
Original line number Diff line number Diff line
@@ -14418,12 +14418,6 @@ static void wlc_phy_txpwr_srom_read_ppr_nphy(struct brcms_phy *pi) 
		switch (band_num) {

		case 0:









			pi->nphy_txpid2g[PHY_CORE_0] =









				(u8) wlapi_getintvar(shim,









						     BRCMS_SROM_TXPID2GA0);









			pi->nphy_txpid2g[PHY_CORE_1] =









				(u8) wlapi_getintvar(shim,









						     BRCMS_SROM_TXPID2GA1);









			pi->nphy_pwrctrl_info[PHY_CORE_0].max_pwr_2g =









				(s8) wlapi_getintvar(shim,









						     BRCMS_SROM_MAXP2GA0);








@@ -14487,12 +14481,6 @@ static void wlc_phy_txpwr_srom_read_ppr_nphy(struct brcms_phy *pi)







			break;









		case 1:

















			pi->nphy_txpid5g[PHY_CORE_0] =









				(u8) wlapi_getintvar(shim,









						     BRCMS_SROM_TXPID5GA0);









			pi->nphy_txpid5g[PHY_CORE_1] =









				(u8) wlapi_getintvar(shim,









						     BRCMS_SROM_TXPID5GA1);









			pi->nphy_pwrctrl_info[PHY_CORE_0].max_pwr_5gm =









				(s8) wlapi_getintvar(shim, BRCMS_SROM_MAXP5GA0);









			pi->nphy_pwrctrl_info[PHY_CORE_1].max_pwr_5gm =








@@ -14552,12 +14540,6 @@ static void wlc_phy_txpwr_srom_read_ppr_nphy(struct brcms_phy *pi)







			break;









		case 2:

















			pi->nphy_txpid5gl[0] =









				(u8) wlapi_getintvar(shim,









						     BRCMS_SROM_TXPID5GLA0);









			pi->nphy_txpid5gl[1] =









				(u8) wlapi_getintvar(shim,









						     BRCMS_SROM_TXPID5GLA1);









			pi->nphy_pwrctrl_info[0].max_pwr_5gl =









				(s8) wlapi_getintvar(shim,









						     BRCMS_SROM_MAXP5GLA0);








@@ -14616,12 +14598,6 @@ static void wlc_phy_txpwr_srom_read_ppr_nphy(struct brcms_phy *pi)







			break;









		case 3:

















			pi->nphy_txpid5gh[0] =









				(u8) wlapi_getintvar(shim,









						     BRCMS_SROM_TXPID5GHA0);









			pi->nphy_txpid5gh[1] =









				(u8) wlapi_getintvar(shim,









						     BRCMS_SROM_TXPID5GHA1);









			pi->nphy_pwrctrl_info[0].max_pwr_5gh =









				(s8) wlapi_getintvar(shim,









						     BRCMS_SROM_MAXP5GHA0);








@@ -27995,20 +27971,11 @@ void wlc_phy_txpwr_fixpower_nphy(struct brcms_phy *pi)







		chan_freq_range = wlc_phy_get_chan_freq_range_nphy(pi, 0);









		switch (chan_freq_range) {









		case WL_CHAN_FREQ_RANGE_2G:









			txpi[0] = pi->nphy_txpid2g[0];









			txpi[1] = pi->nphy_txpid2g[1];









			break;









		case WL_CHAN_FREQ_RANGE_5GL:









			txpi[0] = pi->nphy_txpid5gl[0];









			txpi[1] = pi->nphy_txpid5gl[1];









			break;









		case WL_CHAN_FREQ_RANGE_5GM:









			txpi[0] = pi->nphy_txpid5g[0];









			txpi[1] = pi->nphy_txpid5g[1];









			break;









		case WL_CHAN_FREQ_RANGE_5GH:









			txpi[0] = pi->nphy_txpid5gh[0];









			txpi[1] = pi->nphy_txpid5gh[1];









			txpi[0] = 0;









			txpi[1] = 0;









			break;









		default:









			txpi[0] = txpi[1] = 91;

























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



+0
−32






























Original line number
Diff line number
Diff line







@@ -170,22 +170,6 @@ enum brcms_srom_id {







	BRCMS_SROM_TSSIPOS2G,









	BRCMS_SROM_TSSIPOS5G,









	BRCMS_SROM_TXCHAIN,









	BRCMS_SROM_TXPID2GA0,









	BRCMS_SROM_TXPID2GA1,









	BRCMS_SROM_TXPID2GA2,









	BRCMS_SROM_TXPID2GA3,









	BRCMS_SROM_TXPID5GA0,









	BRCMS_SROM_TXPID5GA1,









	BRCMS_SROM_TXPID5GA2,









	BRCMS_SROM_TXPID5GA3,









	BRCMS_SROM_TXPID5GHA0,









	BRCMS_SROM_TXPID5GHA1,









	BRCMS_SROM_TXPID5GHA2,









	BRCMS_SROM_TXPID5GHA3,









	BRCMS_SROM_TXPID5GLA0,









	BRCMS_SROM_TXPID5GLA1,









	BRCMS_SROM_TXPID5GLA2,









	BRCMS_SROM_TXPID5GLA3,









	/*









	 * per-path identifiers (see srom.c)









	 */








@@ -225,10 +209,6 @@ enum brcms_srom_id {







	BRCMS_SROM_PA2GW2A1,









	BRCMS_SROM_PA2GW2A2,









	BRCMS_SROM_PA2GW2A3,









	BRCMS_SROM_PA2GW3A0,









	BRCMS_SROM_PA2GW3A1,









	BRCMS_SROM_PA2GW3A2,









	BRCMS_SROM_PA2GW3A3,









	BRCMS_SROM_PA5GHW0A0,









	BRCMS_SROM_PA5GHW0A1,









	BRCMS_SROM_PA5GHW0A2,








@@ -241,10 +221,6 @@ enum brcms_srom_id {







	BRCMS_SROM_PA5GHW2A1,









	BRCMS_SROM_PA5GHW2A2,









	BRCMS_SROM_PA5GHW2A3,









	BRCMS_SROM_PA5GHW3A0,









	BRCMS_SROM_PA5GHW3A1,









	BRCMS_SROM_PA5GHW3A2,









	BRCMS_SROM_PA5GHW3A3,









	BRCMS_SROM_PA5GLW0A0,









	BRCMS_SROM_PA5GLW0A1,









	BRCMS_SROM_PA5GLW0A2,








@@ -257,10 +233,6 @@ enum brcms_srom_id {







	BRCMS_SROM_PA5GLW2A1,









	BRCMS_SROM_PA5GLW2A2,









	BRCMS_SROM_PA5GLW2A3,









	BRCMS_SROM_PA5GLW3A0,









	BRCMS_SROM_PA5GLW3A1,









	BRCMS_SROM_PA5GLW3A2,









	BRCMS_SROM_PA5GLW3A3,









	BRCMS_SROM_PA5GW0A0,









	BRCMS_SROM_PA5GW0A1,









	BRCMS_SROM_PA5GW0A2,








@@ -273,10 +245,6 @@ enum brcms_srom_id {







	BRCMS_SROM_PA5GW2A1,









	BRCMS_SROM_PA5GW2A2,









	BRCMS_SROM_PA5GW2A3,









	BRCMS_SROM_PA5GW3A0,









	BRCMS_SROM_PA5GW3A1,









	BRCMS_SROM_PA5GW3A2,









	BRCMS_SROM_PA5GW3A3,









};



















#define	BRCMS_NUMRATES	16	/* max # of rates in a rateset */


































































CRA Git | Maintained and supported by SUSTech CRA and CCSE