rt2x00: rt2800lib: fix default TX power values for RT3593

The TX power values in the EEPROM are using
a different format for the RT3593 chip. The
default TX power value uses bits 0..4 only.
Bits 5..8 contains value for fine grained
power control. Additionally, the lower and
upper limits of the TX power values are the
same for both bands.

Improve the rt2800_txpower_to_dev function,
in order to compute the correct default power
values for the RT3593 chip as well.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Acked-by: Stanislaw Gruszka <stf_xl@wp.pl>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 1738a9d232c3..b11f0b06cc6d 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -2728,8 +2728,15 @@ static char rt2800_txpower_to_dev(struct rt2x00_dev *rt2x00dev,
                                   unsigned int channel,
                                   char txpower)
 {
+        if (rt2x00_rt(rt2x00dev, RT3593))
+                txpower = rt2x00_get_field8(txpower, EEPROM_TXPOWER_ALC);
+
         if (channel <= 14)
                 return clamp_t(char, txpower, MIN_G_TXPOWER, MAX_G_TXPOWER);
+
+        if (rt2x00_rt(rt2x00dev, RT3593))
+                return clamp_t(char, txpower, MIN_A_TXPOWER_3593,
+                               MAX_A_TXPOWER_3593);
         else
                 return clamp_t(char, txpower, MIN_A_TXPOWER, MAX_A_TXPOWER);
 }