mt76: move mt76x02_eeprom_parse_hw_cap in mt76x02-lib module

Move mt76x02_eeprom_parse_hw_cap utility routine in mt76x02-lib
module in order to be reused in mt76x0 driver

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/mt76x02_eeprom.c b/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c
index 2377c758da5da5b767d0c781f77bdfe35fbd0940..d3efeb8a72b71bc8dd653becac0e25974cbf3669 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c
@@ -71,6 +71,25 @@ int mt76x02_get_efuse_data(struct mt76_dev *dev, u16 base, void *buf,
 }
 EXPORT_SYMBOL_GPL(mt76x02_get_efuse_data);
 
+void mt76x02_eeprom_parse_hw_cap(struct mt76_dev *dev)
+{
+       u16 val = mt76x02_eeprom_get(dev, MT_EE_NIC_CONF_0);
+
+       switch (FIELD_GET(MT_EE_NIC_CONF_0_BOARD_TYPE, val)) {
+       case BOARD_TYPE_5GHZ:
+               dev->cap.has_5ghz = true;
+               break;
+       case BOARD_TYPE_2GHZ:
+               dev->cap.has_2ghz = true;
+               break;
+       default:
+               dev->cap.has_2ghz = true;
+               dev->cap.has_5ghz = true;
+               break;
+       }
+}
+EXPORT_SYMBOL_GPL(mt76x02_eeprom_parse_hw_cap);
+
 bool mt76x02_ext_pa_enabled(struct mt76_dev *dev, enum nl80211_band band)
 {
        u16 conf0 = mt76x02_eeprom_get(dev, MT_EE_NIC_CONF_0);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h b/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h
index 995aebbcc19474f8e055717afaddbaf045e7a843..119813960fe7152ba8dcc0958a6b99c4a79c99a1 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h
@@ -132,6 +132,11 @@ enum mt76x02_eeprom_modes {
        MT_EE_PHYSICAL_READ,
 };
 
+enum mt76x02_board_type {
+       BOARD_TYPE_2GHZ = 1,
+       BOARD_TYPE_5GHZ = 2,
+};
+
 static inline bool mt76x02_field_valid(u8 val)
 {
        return val != 0 && val != 0xff;
@@ -165,5 +170,6 @@ void mt76x02_get_rx_gain(struct mt76_dev *dev, enum nl80211_band band,
 u8 mt76x02_get_lna_gain(struct mt76_dev *dev,
                        s8 *lna_2g, s8 *lna_5g,
                        struct ieee80211_channel *chan);
+void mt76x02_eeprom_parse_hw_cap(struct mt76_dev *dev);
 
 #endif /* __MT76x02_EEPROM_H */

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c b/drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c
index ef440749473c28cc46dda4240731c2a2e00c5671..31127c0293900fdd443522aedfd544fde76c9db4 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c
@@ -40,25 +40,6 @@ mt76x2_eeprom_get_macaddr(struct mt76x2_dev *dev)
        return 0;
 }
 
-void mt76x2_eeprom_parse_hw_cap(struct mt76x2_dev *dev)
-{
-       u16 val = mt76x02_eeprom_get(&dev->mt76, MT_EE_NIC_CONF_0);
-
-       switch (FIELD_GET(MT_EE_NIC_CONF_0_BOARD_TYPE, val)) {
-       case BOARD_TYPE_5GHZ:
-               dev->mt76.cap.has_5ghz = true;
-               break;
-       case BOARD_TYPE_2GHZ:
-               dev->mt76.cap.has_2ghz = true;
-               break;
-       default:
-               dev->mt76.cap.has_2ghz = true;
-               dev->mt76.cap.has_5ghz = true;
-               break;
-       }
-}
-EXPORT_SYMBOL_GPL(mt76x2_eeprom_parse_hw_cap);
-
 static bool
 mt76x2_has_cal_free_data(struct mt76x2_dev *dev, u8 *efuse)
 {
@@ -566,7 +547,7 @@ int mt76x2_eeprom_init(struct mt76x2_dev *dev)
        if (ret)
                return ret;
 
-       mt76x2_eeprom_parse_hw_cap(dev);
+       mt76x02_eeprom_parse_hw_cap(&dev->mt76);
        mt76x2_eeprom_get_macaddr(dev);
        mt76_eeprom_override(&dev->mt76);
        dev->mt76.macaddr[0] &= ~BIT(1);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.h b/drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.h
index da476aad65fb69fad30aeb0d697b97e11c566258..ad98a52ec69f67d8e3bf450f307f44dba26fd411 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.h
@@ -19,11 +19,6 @@
 
 #include "mt76x02_eeprom.h"
 
-enum mt76x2_board_type {
-       BOARD_TYPE_2GHZ = 1,
-       BOARD_TYPE_5GHZ = 2,
-};
-
 enum mt76x2_cal_channel_group {
        MT_CH_5G_JAPAN,
        MT_CH_5G_UNII_1,
@@ -64,7 +59,6 @@ void mt76x2_get_power_info(struct mt76x2_dev *dev,
                           struct ieee80211_channel *chan);
 int mt76x2_get_temp_comp(struct mt76x2_dev *dev, struct mt76x2_temp_comp *t);
 void mt76x2_read_rx_gain(struct mt76x2_dev *dev);
-void mt76x2_eeprom_parse_hw_cap(struct mt76x2_dev *dev);
 
 static inline bool
 mt76x2_temp_tx_alc_enabled(struct mt76x2_dev *dev)

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2u_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2u_init.c
index 89cfacfb276cfcab5a1fd3da92b174bf7163b511..7a9ebc8985f29e4dda6865f5598130dd01469aa4 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2u_init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2u_init.c
@@ -129,7 +129,7 @@ static int mt76x2u_init_eeprom(struct mt76x2_dev *dev)
                put_unaligned_le32(val, dev->mt76.eeprom.data + i);
        }
 
-       mt76x2_eeprom_parse_hw_cap(dev);
+       mt76x02_eeprom_parse_hw_cap(&dev->mt76);
        return 0;
 }