diff options
| author | Felix Fietkau <nbd@nbd.name> | 2021-01-13 19:35:59 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2021-01-27 17:30:01 +0100 |
| commit | 45a8b67a355279f932807ac8740c0f080f065907 (patch) | |
| tree | 875fbcf612645629de41b276fe20f8a222f1f9b7 /drivers/net/wireless/mediatek/mt76/mt7915 | |
| parent | f7fc2bbe4680eb886fa7a7b647120990fd74e497 (diff) | |
| download | linux-stable-45a8b67a355279f932807ac8740c0f080f065907.tar.gz linux-stable-45a8b67a355279f932807ac8740c0f080f065907.tar.bz2 linux-stable-45a8b67a355279f932807ac8740c0f080f065907.zip | |
mt76: mt7915: fix eeprom DBDC band selection
When the EEPROM band fields contain default values, assign 2.4 GHz to the
first band and 5 GHz to the second.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'drivers/net/wireless/mediatek/mt76/mt7915')
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c | 7 | ||||
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c index 291a781dada2..660398ac53c2 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c @@ -54,11 +54,14 @@ void mt7915_eeprom_parse_band_config(struct mt7915_phy *phy) val = mt7915_eeprom_read(dev, MT_EE_WIFI_CONF + ext_phy); val = FIELD_GET(MT_EE_WIFI_CONF0_BAND_SEL, val); + if (val == MT_EE_BAND_SEL_DEFAULT && dev->dbdc_support) + val = ext_phy ? MT_EE_BAND_SEL_5GHZ : MT_EE_BAND_SEL_2GHZ; + switch (val) { - case MT_EE_5GHZ: + case MT_EE_BAND_SEL_5GHZ: phy->mt76->cap.has_5ghz = true; break; - case MT_EE_2GHZ: + case MT_EE_BAND_SEL_2GHZ: phy->mt76->cap.has_2ghz = true; break; default: diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h b/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h index 7999e95560a8..3ee8c27bb61b 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h +++ b/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h @@ -35,10 +35,10 @@ enum mt7915_eeprom_field { #define MT_EE_WIFI_CONF7_TSSI1_5G BIT(4) enum mt7915_eeprom_band { - MT_EE_DUAL_BAND, - MT_EE_5GHZ, - MT_EE_2GHZ, - MT_EE_DBDC, + MT_EE_BAND_SEL_DEFAULT, + MT_EE_BAND_SEL_5GHZ, + MT_EE_BAND_SEL_2GHZ, + MT_EE_BAND_SEL_DUAL, }; #define SKU_DELTA_VAL GENMASK(5, 0) |