]> git.baikalelectronics.ru Git - kernel.git/commitdiff
mt76: mt7603: fix reading target tx power from eeprom
authorFelix Fietkau <nbd@nbd.name>
Fri, 31 May 2019 20:02:17 +0000 (22:02 +0200)
committerFelix Fietkau <nbd@nbd.name>
Thu, 27 Jun 2019 10:56:04 +0000 (12:56 +0200)
For the external PA (TSSI OFF) case, the target power needs to be read
from a different location in EEPROM

Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/mt7603/eeprom.h
drivers/net/wireless/mediatek/mt76/mt7603/init.c

index f27b99b7e359b6870f4fafd0ea6d1498835ca580..b893facfba480e0e9bfded6b78b1247eaaa2a9d0 100644 (file)
@@ -69,6 +69,8 @@ enum mt7603_eeprom_field {
 
        MT_EE_CP_FT_VERSION =                   0x0f0,
 
+       MT_EE_TX_POWER_TSSI_OFF =               0x0f2,
+
        MT_EE_XTAL_FREQ_OFFSET =                0x0f4,
        MT_EE_XTAL_TRIM_2_COMP =                0x0f5,
        MT_EE_XTAL_TRIM_3_COMP =                0x0f6,
index 4e269044f8a44ca07b891b762b0c9fe5ee6c77e3..43baad7fd0829a9adaa1f239f9e78a58722a7e5e 100644 (file)
@@ -465,9 +465,13 @@ mt7603_init_txpower(struct mt7603_dev *dev,
        u8 *eeprom = (u8 *)dev->mt76.eeprom.data;
        int target_power = eeprom[MT_EE_TX_POWER_0_START_2G + 2] & ~BIT(7);
        u8 *rate_power = &eeprom[MT_EE_TX_POWER_CCK];
+       bool ext_pa = eeprom[MT_EE_NIC_CONF_0 + 1] & BIT(1);
        int max_offset, cur_offset;
        int i;
 
+       if (ext_pa && is_mt7603(dev))
+               target_power = eeprom[MT_EE_TX_POWER_TSSI_OFF] & ~BIT(7);
+
        if (target_power & BIT(6))
                target_power = -(target_power & GENMASK(5, 0));