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: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
index 3bc6d7b..638a2bc 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
@@ -271,13 +271,6 @@ static void mt76x0_vco_cal(struct mt76x02_dev *dev, u8 channel)
 }
 
 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)
 {
        switch (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,

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_phy.c b/drivers/net/wireless/mediatek/mt76/mt76x02_phy.c
index 3de7170..b0c78ab 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_phy.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_phy.c
@@ -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);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_phy.h b/drivers/net/wireless/mediatek/mt76/mt76x02_phy.h
index e0ca44e..1a20c18 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_phy.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_phy.h
@@ -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 */

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h b/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h
index 8b18aca..ab93125 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h
@@ -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

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c
index 991db4f..5942cc7 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c
@@ -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,

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c b/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c
index dcb3381..e9fff5b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c
@@ -210,24 +210,6 @@ void mt76x2_configure_tx_delay(struct mt76x02_dev *dev,
 }
 EXPORT_SYMBOL_GPL(mt76x2_configure_tx_delay);
 
-void mt76x2_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(mt76x2_phy_set_band);
-
 void mt76x2_phy_tssi_compensate(struct mt76x02_dev *dev, bool wait)
 {
        struct ieee80211_channel *chan = dev->mt76.chandef.chan;

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_phy.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_phy.c
index ff2fd71..c0c8c0a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_phy.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_phy.c
@@ -155,7 +155,7 @@ int mt76x2u_phy_set_channel(struct mt76x02_dev *dev,
        mt76x2_configure_tx_delay(dev, chan->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,