Commit 3d66939a authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau

mt76x0: unify parse hw capabilities

Unify parse hw capabilities with mt76x2 driver using
mt76x02_eeprom_parse_hw_cap utility routine available
in mt76x02-lib module
Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 63cf8d12
...@@ -51,29 +51,13 @@ mt76x0_efuse_physical_size_check(struct mt76x0_dev *dev) ...@@ -51,29 +51,13 @@ mt76x0_efuse_physical_size_check(struct mt76x0_dev *dev)
return 0; return 0;
} }
static void static void mt76x0_set_chip_cap(struct mt76x0_dev *dev)
mt76x0_set_chip_cap(struct mt76x0_dev *dev, u8 *eeprom)
{ {
enum mt76x2_board_type { BOARD_TYPE_2GHZ = 1, BOARD_TYPE_5GHZ = 2 }; u16 nic_conf0 = mt76x02_eeprom_get(&dev->mt76, MT_EE_NIC_CONF_0);
u16 nic_conf0 = get_unaligned_le16(eeprom + MT_EE_NIC_CONF_0); u16 nic_conf1 = mt76x02_eeprom_get(&dev->mt76, MT_EE_NIC_CONF_1);
u16 nic_conf1 = get_unaligned_le16(eeprom + MT_EE_NIC_CONF_1);
dev_dbg(dev->mt76.dev, "NIC_CONF0: %04x NIC_CONF1: %04x\n", nic_conf0, nic_conf1);
switch (FIELD_GET(MT_EE_NIC_CONF_0_BOARD_TYPE, nic_conf0)) {
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;
}
dev_dbg(dev->mt76.dev, "Has 2GHZ %d 5GHZ %d\n", mt76x02_eeprom_parse_hw_cap(&dev->mt76);
dev_dbg(dev->mt76.dev, "2GHz %d 5GHz %d\n",
dev->mt76.cap.has_2ghz, dev->mt76.cap.has_5ghz); dev->mt76.cap.has_2ghz, dev->mt76.cap.has_5ghz);
if (!mt76x02_field_valid(nic_conf1 & 0xff)) if (!mt76x02_field_valid(nic_conf1 & 0xff))
...@@ -81,15 +65,14 @@ mt76x0_set_chip_cap(struct mt76x0_dev *dev, u8 *eeprom) ...@@ -81,15 +65,14 @@ mt76x0_set_chip_cap(struct mt76x0_dev *dev, u8 *eeprom)
if (nic_conf1 & MT_EE_NIC_CONF_1_HW_RF_CTRL) if (nic_conf1 & MT_EE_NIC_CONF_1_HW_RF_CTRL)
dev_err(dev->mt76.dev, dev_err(dev->mt76.dev,
"Error: this driver does not support HW RF ctrl\n"); "driver does not support HW RF ctrl\n");
if (!mt76x02_field_valid(nic_conf0 >> 8)) if (!mt76x02_field_valid(nic_conf0 >> 8))
return; return;
if (FIELD_GET(MT_EE_NIC_CONF_0_RX_PATH, nic_conf0) > 1 || if (FIELD_GET(MT_EE_NIC_CONF_0_RX_PATH, nic_conf0) > 1 ||
FIELD_GET(MT_EE_NIC_CONF_0_TX_PATH, nic_conf0) > 1) FIELD_GET(MT_EE_NIC_CONF_0_TX_PATH, nic_conf0) > 1)
dev_err(dev->mt76.dev, dev_err(dev->mt76.dev, "invalid tx-rx stream\n");
"Error: device has more than 1 RX/TX stream!\n");
} }
static void mt76x0_set_temp_offset(struct mt76x0_dev *dev) static void mt76x0_set_temp_offset(struct mt76x0_dev *dev)
...@@ -283,7 +266,7 @@ mt76x0_eeprom_init(struct mt76x0_dev *dev) ...@@ -283,7 +266,7 @@ mt76x0_eeprom_init(struct mt76x0_dev *dev)
eeprom[MT_EE_VERSION + 1], eeprom[MT_EE_VERSION]); eeprom[MT_EE_VERSION + 1], eeprom[MT_EE_VERSION]);
mt76x02_mac_setaddr(&dev->mt76, eeprom + MT_EE_MAC_ADDR); mt76x02_mac_setaddr(&dev->mt76, eeprom + MT_EE_MAC_ADDR);
mt76x0_set_chip_cap(dev, eeprom); mt76x0_set_chip_cap(dev);
mt76x0_set_freq_offset(dev); mt76x0_set_freq_offset(dev);
mt76x0_set_temp_offset(dev); mt76x0_set_temp_offset(dev);
dev->chainmask = 0x0101; dev->chainmask = 0x0101;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment