projects / openwrt / staging / pepe2k.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
realtek: use upstream recommendation for secondary CPU start
[openwrt/staging/pepe2k.git] / package / kernel / mac80211 / patches / rt2x00 / 650-rt2x00-add-support-for-external-PA-on-MT7620.patch
diff --git a/package/kernel/mac80211/patches/rt2x00/650-rt2x00-add-support-for-external-PA-on-MT7620.patch b/package/kernel/mac80211/patches/rt2x00/650-rt2x00-add-support-for-external-PA-on-MT7620.patch
index 9fad80b67264579dac262021b534cb696c9e1474..fe023cf77a4b8fcdb40096166e6d43bb785a9533 100644 (file)
--- a/package/kernel/mac80211/patches/rt2x00/650-rt2x00-add-support-for-external-PA-on-MT7620.patch
+++ b/package/kernel/mac80211/patches/rt2x00/650-rt2x00-add-support-for-external-PA-on-MT7620.patch
@@ -1,39 +1,49 @@
-From 9782a7f7488443568fa4d6088b73c9aff7eb8510 Mon Sep 17 00:00:00 2001
+From 8dcdb02e3ad5f3d384c071e0a36670bb342bab35 Mon Sep 17 00:00:00 2001
 From: Daniel Golle <daniel@makrotopia.org>
 Date: Wed, 19 Apr 2017 16:14:53 +0200
-Subject: [PATCH] rt2x00: add support for external PA on MT7620
-To: Stanislaw Gruszka <sgruszka@redhat.com>
-Cc: Helmut Schaa <helmut.schaa@googlemail.com>,
-    linux-wireless@vger.kernel.org,
-    Kalle Valo <kvalo@codeaurora.org>
+Subject: [PATCH 03/16] rt2x00: add support for external PA on MT7620
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+To: linux-wireless@vger.kernel.org,
+    Stanislaw Gruszka <stf_xl@wp.pl>,
+    Helmut Schaa <helmut.schaa@googlemail.com>
+Cc: Kalle Valo <kvalo@kernel.org>,
+    David S. Miller <davem@davemloft.net>,
+    Eric Dumazet <edumazet@google.com>,
+    Jakub Kicinski <kuba@kernel.org>,
+    Paolo Abeni <pabeni@redhat.com>,
+    Johannes Berg <johannes.berg@intel.com>
 
+Implement support for external PA connected to MT7620A.
+
+Signed-off-by: Tomislav Požega <pozega.tomislav@gmail.com>
+[pozega.tomislav@gmail.com: use chanreg and dccal helpers.]
 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 ---
- drivers/net/wireless/ralink/rt2x00/rt2800.h    |  1 +
- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 70 +++++++++++++++++++++++++-
- 2 files changed, 70 insertions(+), 1 deletion(-)
+ drivers/net/wireless/ralink/rt2x00/rt2800.h   |  1 +
+ .../net/wireless/ralink/rt2x00/rt2800lib.c    | 52 ++++++++++++++++++-
+ 2 files changed, 52 insertions(+), 1 deletion(-)
 
 --- a/drivers/net/wireless/ralink/rt2x00/rt2800.h
 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800.h
-@@ -2749,6 +2749,7 @@ enum rt2800_eeprom_word {
+@@ -2739,6 +2739,7 @@ enum rt2800_eeprom_word {
  #define EEPROM_NIC_CONF2_RX_STREAM    FIELD16(0x000f)
  #define EEPROM_NIC_CONF2_TX_STREAM    FIELD16(0x00f0)
  #define EEPROM_NIC_CONF2_CRYSTAL      FIELD16(0x0600)
-+#define EEPROM_NIC_CONF2_EXTERNAL_PA  FIELD16(0xc000)
++#define EEPROM_NIC_CONF2_EXTERNAL_PA  FIELD16(0x8000)
  
  /*
   * EEPROM LNA
 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
-@@ -4120,6 +4120,61 @@ static void rt2800_config_channel(struct
+@@ -4369,6 +4369,43 @@ static void rt2800_config_channel(struct
                rt2800_iq_calibrate(rt2x00dev, rf->channel);
        }
  
 +      if (rt2x00_rt(rt2x00dev, RT6352)) {
 +              if (test_bit(CAPABILITY_EXTERNAL_PA_TX0,
 +                           &rt2x00dev->cap_flags)) {
-+                      rt2x00_warn(rt2x00dev, "Using incomplete support for " \
-+                                             "external PA\n");
 +                      reg = rt2800_register_read(rt2x00dev, RF_CONTROL3);
 +                      reg |= 0x00000101;
 +                      rt2800_register_write(rt2x00dev, RF_CONTROL3, reg);
@@ -42,38 +52,22 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 +                      reg |= 0x00000101;
 +                      rt2800_register_write(rt2x00dev, RF_BYPASS3, reg);
 +
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 43, 0x73);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 43, 0x73);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 44, 0x73);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 44, 0x73);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 45, 0x73);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 45, 0x73);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 46, 0x27);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 46, 0x27);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 47, 0xC8);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 47, 0xC8);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 48, 0xA4);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 48, 0xA4);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 49, 0x05);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 49, 0x05);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 54, 0x27);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 54, 0x27);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 55, 0xC8);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 55, 0xC8);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 56, 0xA4);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 56, 0xA4);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 57, 0x05);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 57, 0x05);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 58, 0x27);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 58, 0x27);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 59, 0xC8);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 59, 0xC8);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 60, 0xA4);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 60, 0xA4);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 4, 61, 0x05);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 6, 61, 0x05);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 5, 05, 0x00);
-+                      rt2800_rfcsr_write_bank(rt2x00dev, 7, 05, 0x00);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 43, 0x73);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 44, 0x73);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 45, 0x73);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 46, 0x27);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 47, 0xC8);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 48, 0xA4);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 49, 0x05);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 54, 0x27);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0xC8);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 56, 0xA4);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 57, 0x05);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 58, 0x27);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 59, 0xC8);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 60, 0xA4);
++                      rt2800_rfcsr_write_chanreg(rt2x00dev, 61, 0x05);
++                      rt2800_rfcsr_write_dccal(rt2x00dev, 05, 0x00);
 +
 +                      rt2800_register_write(rt2x00dev, TX0_RF_GAIN_CORRECT,
 +                                            0x36303636);
@@ -87,7 +81,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
        bbp = rt2800_bbp_read(rt2x00dev, 4);
        rt2x00_set_field8(&bbp, BBP4_BANDWIDTH, 2 * conf_is_ht40(conf));
        rt2800_bbp_write(rt2x00dev, 4, bbp);
-@@ -9314,7 +9369,8 @@ static int rt2800_init_eeprom(struct rt2
+@@ -9578,7 +9615,8 @@ static int rt2800_init_eeprom(struct rt2
         */
        eeprom = rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1);
  
@@ -97,19 +91,19 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
                if (rt2x00_get_field16(eeprom,
                    EEPROM_NIC_CONF1_EXTERNAL_TX0_PA_3352))
                    __set_bit(CAPABILITY_EXTERNAL_PA_TX0,
-@@ -9325,6 +9381,18 @@ static int rt2800_init_eeprom(struct rt2
+@@ -9589,6 +9627,18 @@ static int rt2800_init_eeprom(struct rt2
                              &rt2x00dev->cap_flags);
        }
  
 +      eeprom = rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF2);
 +
 +      if (rt2x00_rt(rt2x00dev, RT6352) && eeprom != 0 && eeprom != 0xffff) {
-+              if (rt2x00_get_field16(eeprom,
-+                  EEPROM_NIC_CONF2_EXTERNAL_PA)) {
-+                  __set_bit(CAPABILITY_EXTERNAL_PA_TX0,
-+                            &rt2x00dev->cap_flags);
-+                  __set_bit(CAPABILITY_EXTERNAL_PA_TX1,
-+                            &rt2x00dev->cap_flags);
++              if (!rt2x00_get_field16(eeprom,
++                                      EEPROM_NIC_CONF2_EXTERNAL_PA)) {
++                      __clear_bit(CAPABILITY_EXTERNAL_PA_TX0,
++                                  &rt2x00dev->cap_flags);
++                      __clear_bit(CAPABILITY_EXTERNAL_PA_TX1,
++                                  &rt2x00dev->cap_flags);
 +              }
 +      }
 +
Staging tree of Piotr Dymacz