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

Commit 370c6415 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: move mt76x02_phy_set_band in mt76x02-lib module 



Move mt76x02_phy_set_band routine in mt76x02_phy.c since
it is shared between mt76x0 and mt76x2 drivers and remove
duplicated code

Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 032c08f4

drivers/net/wireless/mediatek/mt76/mt76x0/phy.c

+2 −14
Original line number Diff line number Diff line
@@ -270,13 +270,6 @@ static void mt76x0_vco_cal(struct mt76x02_dev *dev, u8 channel) 
	msleep(2);

}



static void

mt76x0_mac_set_ctrlch(struct mt76x02_dev *dev, bool primary_upper)

{

	mt76_rmw_field(dev, MT_TX_BAND_CFG, MT_TX_BAND_CFG_UPPER_40M,

		       primary_upper);

}



static void

mt76x0_phy_set_band(struct mt76x02_dev *dev, enum nl80211_band band)

{
@@ -287,9 +280,6 @@ mt76x0_phy_set_band(struct mt76x02_dev *dev, enum nl80211_band band) 
		rf_wr(dev, MT_RF(5, 0), 0x45);

		rf_wr(dev, MT_RF(6, 0), 0x44);



		mt76_set(dev, MT_TX_BAND_CFG, MT_TX_BAND_CFG_2G);

		mt76_clear(dev, MT_TX_BAND_CFG, MT_TX_BAND_CFG_5G);



		mt76_wr(dev, MT_TX_ALC_VGA3, 0x00050007);

		mt76_wr(dev, MT_TX0_RF_GAIN_CORR, 0x003E0002);

		break;
@@ -299,9 +289,6 @@ mt76x0_phy_set_band(struct mt76x02_dev *dev, enum nl80211_band band) 
		rf_wr(dev, MT_RF(5, 0), 0x44);

		rf_wr(dev, MT_RF(6, 0), 0x45);



		mt76_clear(dev, MT_TX_BAND_CFG, MT_TX_BAND_CFG_2G);

		mt76_set(dev, MT_TX_BAND_CFG, MT_TX_BAND_CFG_5G);



		mt76_wr(dev, MT_TX_ALC_VGA3, 0x00000005);

		mt76_wr(dev, MT_TX0_RF_GAIN_CORR, 0x01010102);

		break;
@@ -655,7 +642,8 @@ int mt76x0_phy_set_channel(struct mt76x02_dev *dev, 


	mt76x0_bbp_set_bw(dev, chandef->width);

	mt76x02_phy_set_bw(dev, chandef->width, ch_group_index);

	mt76x0_mac_set_ctrlch(dev, ch_group_index & 1);

	mt76x02_phy_set_band(dev, chandef->chan->band,

			     ch_group_index & 1);

	mt76x0_ant_select(dev);



	mt76_rmw(dev, MT_EXT_CCA_CFG,

drivers/net/wireless/mediatek/mt76/mt76x02_phy.c

+19 −0
Original line number Diff line number Diff line
@@ -204,3 +204,22 @@ void mt76x02_phy_set_bw(struct mt76x02_dev *dev, int width, u8 ctrl) 
	mt76_rmw_field(dev, MT_BBP(TXBE, 0), MT_BBP_TXBE_R0_CTRL_CHAN, ctrl);

}

EXPORT_SYMBOL_GPL(mt76x02_phy_set_bw);



void mt76x02_phy_set_band(struct mt76x02_dev *dev, int band,

			  bool primary_upper)

{

	switch (band) {

	case NL80211_BAND_2GHZ:

		mt76_set(dev, MT_TX_BAND_CFG, MT_TX_BAND_CFG_2G);

		mt76_clear(dev, MT_TX_BAND_CFG, MT_TX_BAND_CFG_5G);

		break;

	case NL80211_BAND_5GHZ:

		mt76_clear(dev, MT_TX_BAND_CFG, MT_TX_BAND_CFG_2G);

		mt76_set(dev, MT_TX_BAND_CFG, MT_TX_BAND_CFG_5G);

		break;

	}



	mt76_rmw_field(dev, MT_TX_BAND_CFG, MT_TX_BAND_CFG_UPPER_40M,

		       primary_upper);

}

EXPORT_SYMBOL_GPL(mt76x02_phy_set_band);

drivers/net/wireless/mediatek/mt76/mt76x02_phy.h

+2 −0
Original line number Diff line number Diff line
@@ -27,5 +27,7 @@ void mt76x02_phy_set_rxpath(struct mt76x02_dev *dev); 
void mt76x02_phy_set_txdac(struct mt76x02_dev *dev);

int mt76x02_phy_get_min_avg_rssi(struct mt76x02_dev *dev);

void mt76x02_phy_set_bw(struct mt76x02_dev *dev, int width, u8 ctrl);

void mt76x02_phy_set_band(struct mt76x02_dev *dev, int band,

			  bool primary_upper);



#endif /* __MT76x02_PHY_H */

drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h

+0 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ void mt76x2_phy_set_txpower_regs(struct mt76x02_dev *dev, 
				 enum nl80211_band band);

void mt76x2_configure_tx_delay(struct mt76x02_dev *dev,

			       enum nl80211_band band, u8 bw);

void mt76x2_phy_set_band(struct mt76x02_dev *dev, int band, bool primary_upper);

void mt76x2_apply_gain_adj(struct mt76x02_dev *dev);



#endif

drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ int mt76x2_phy_set_channel(struct mt76x02_dev *dev, 
	mt76x2_configure_tx_delay(dev, band, bw);

	mt76x2_phy_set_txpower(dev);



	mt76x2_phy_set_band(dev, chan->band, ch_group_index & 1);

	mt76x02_phy_set_band(dev, chan->band, ch_group_index & 1);

	mt76x02_phy_set_bw(dev, chandef->width, ch_group_index);



	mt76_rmw(dev, MT_EXT_CCA_CFG,