mac80211: clean and submit a bunch of rt2x00 patches

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / rt2x00 / 982-rt2x00-add-RF-self-TXDC-calibration.patch

diff --git a/package/kernel/mac80211/patches/rt2x00/982-rt2x00-add-RF-self-TXDC-calibration.patch b/package/kernel/mac80211/patches/rt2x00/982-rt2x00-add-RF-self-TXDC-calibration.patch
index b74bea20202f64cfa41733b43711720da8234941..ed8a737a4c6bc439bccd6c1e7e09ba4879a7462f 100644 (file)
--- a/package/kernel/mac80211/patches/rt2x00/982-rt2x00-add-RF-self-TXDC-calibration.patch
+++ b/package/kernel/mac80211/patches/rt2x00/982-rt2x00-add-RF-self-TXDC-calibration.patch
@@ -1,20 +1,32 @@
-From: =?UTF-8?q?Tomislav=20Po=C5=BEega?= <pozega.tomislav@gmail.com>
+From 21f2acf0f9e9da35fbdb96ee0aea97b02472030b Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
 Date: Mon, 8 Jan 2018 13:42:27 +0100
-Subject: [PATCH] rt2x00: add RF self TXDC calibration
+Subject: [PATCH 04/16] rt2x00: add RF self TXDC calibration for 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>
+
+From: Tomislav Požega <pozega.tomislav@gmail.com>
 
 Add TX self calibration based on mtk driver.
 
 Signed-off-by: Tomislav Požega <pozega.tomislav@gmail.com>
 ---
- .../net/wireless/ralink/rt2x00/rt2800lib.c    | 51 +++++++++++++++++++
- 1 file changed, 51 insertions(+)
+ .../net/wireless/ralink/rt2x00/rt2800lib.c    | 48 +++++++++++++++++++
+ 1 file changed, 48 insertions(+)
 
 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
-@@ -8438,6 +8438,56 @@ static void rt2800_init_rfcsr_5592(struc
+@@ -8436,6 +8436,53 @@ static void rt2800_init_rfcsr_5592(struc
        rt2800_led_open_drain_enable(rt2x00dev);
  }
  
@@ -24,7 +36,6 @@ Signed-off-by: Tomislav Požega <pozega.tomislav@gmail.com>
 +      u32 mac0518, mac051c, mac0528, mac052c;
 +      u8 i;
 +
-+      rt2x00_info(rt2x00dev, "RF Tx self calibration start\n");
 +      mac0518 = rt2800_register_read(rt2x00dev, RF_CONTROL0);
 +      mac051c = rt2800_register_read(rt2x00dev, RF_BYPASS0);
 +      mac0528 = rt2800_register_read(rt2x00dev, RF_CONTROL2);
@@ -42,18 +53,18 @@ Signed-off-by: Tomislav Požega <pozega.tomislav@gmail.com>
 +
 +      rt2800_rfcsr_write_bank(rt2x00dev, 5, 1, 0x4);
 +      for (i = 0; i < 100; i = i + 1) {
-+              udelay(50);
++              usleep_range(50, 100);
 +              rfvalue = rt2800_rfcsr_read_bank(rt2x00dev, 5, 1);
-+              if((rfvalue & 0x04) != 0x4)
++              if ((rfvalue & 0x04) != 0x4)
 +                      break;
 +      }
 +      rt2800_rfcsr_write_bank(rt2x00dev, 5, 1, rfb5r1_org);
 +
 +      rt2800_rfcsr_write_bank(rt2x00dev, 7, 1, 0x4);
 +      for (i = 0; i < 100; i = i + 1) {
-+              udelay(50);
++              usleep_range(50, 100);
 +              rfvalue = rt2800_rfcsr_read_bank(rt2x00dev, 7, 1);
-+              if((rfvalue & 0x04) != 0x4)
++              if ((rfvalue & 0x04) != 0x4)
 +                      break;
 +      }
 +      rt2800_rfcsr_write_bank(rt2x00dev, 7, 1, rfb7r1_org);
@@ -64,14 +75,12 @@ Signed-off-by: Tomislav Požega <pozega.tomislav@gmail.com>
 +      rt2800_register_write(rt2x00dev, RF_BYPASS0, mac051c);
 +      rt2800_register_write(rt2x00dev, RF_CONTROL2, mac0528);
 +      rt2800_register_write(rt2x00dev, RF_BYPASS2, mac052c);
-+
-+      rt2x00_info(rt2x00dev, "RF Tx self calibration end\n");
 +}
 +
  static void rt2800_bbp_core_soft_reset(struct rt2x00_dev *rt2x00dev,
                                       bool set_bw, bool is_ht40)
  {
-@@ -9045,6 +9095,7 @@ static void rt2800_init_rfcsr_6352(struc
+@@ -9043,6 +9090,7 @@ static void rt2800_init_rfcsr_6352(struc
        rt2800_rfcsr_write_dccal(rt2x00dev, 5, 0x00);
        rt2800_rfcsr_write_dccal(rt2x00dev, 17, 0x7C);