rt2800: fix mt7620 vco calibration registers

Use register values from init LNA function instead of the ones from
restore LNA function. Apply register values based on rx path
configuration.

Signed-off-by: Tomislav Požega <pozega.tomislav@gmail.com>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
index 870bf315f98be7cbadf3993106b3151a7c253ea6..86cffee6876a7899eef9908748607d472837dcf3 100644 (file)
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
@@ -4932,7 +4932,7 @@ void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev)
        rt2800_register_write(rt2x00dev, TX_PIN_CFG, tx_pin);
 
        if (rt2x00_rt(rt2x00dev, RT6352)) {
-               if (rt2x00dev->default_ant.tx_chain_num == 1) {
+               if (rt2x00dev->default_ant.rx_chain_num == 1) {
                        rt2800_bbp_write(rt2x00dev, 91, 0x07);
                        rt2800_bbp_write(rt2x00dev, 95, 0x1A);
                        rt2800_bbp_write(rt2x00dev, 195, 128);
@@ -4953,8 +4953,8 @@ void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev)
                }
 
                if (rt2x00_has_cap_external_lna_bg(rt2x00dev)) {
-                       rt2800_bbp_write(rt2x00dev, 75, 0x60);
-                       rt2800_bbp_write(rt2x00dev, 76, 0x44);
+                       rt2800_bbp_write(rt2x00dev, 75, 0x68);
+                       rt2800_bbp_write(rt2x00dev, 76, 0x4C);
                        rt2800_bbp_write(rt2x00dev, 79, 0x1C);
                        rt2800_bbp_write(rt2x00dev, 80, 0x0C);
                        rt2800_bbp_write(rt2x00dev, 82, 0xB6);