mac80211: clean and submit a bunch of rt2x00 patches

[openwrt/staging/ansuel.git] / package / kernel / mac80211 / patches / rt2x00 / 984-rt2x00-add-RXDCOC-calibration.patch

diff --git a/package/kernel/mac80211/patches/rt2x00/984-rt2x00-add-RXDCOC-calibration.patch b/package/kernel/mac80211/patches/rt2x00/984-rt2x00-add-RXDCOC-calibration.patch
index 821af87ec18f27077946b0d0f1e1128ba9f55a0f..fa732c97a6132f2590d983ad8a6463e2cebd068a 100644 (file)
--- a/package/kernel/mac80211/patches/rt2x00/984-rt2x00-add-RXDCOC-calibration.patch
+++ b/package/kernel/mac80211/patches/rt2x00/984-rt2x00-add-RXDCOC-calibration.patch
@@ -1,12 +1,26 @@
-From: =?UTF-8?q?Tomislav=20Po=C5=BEega?= <pozega.tomislav@gmail.com>
+From 865823b63f608ac024d326a465ba8fc1a28868cd Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
 Date: Mon, 8 Jan 2018 13:43:37 +0100
-Subject: [PATCH] rt2x00: add RXDCOC calibration
+Subject: [PATCH 06/16] rt2x00: add RXDCOC 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 RXDCOC calibration code from mtk driver.
 
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+[fixed typo reported by Serge Vasilugin <vasilugin@yandex.ru>]
 Signed-off-by: Tomislav Požega <pozega.tomislav@gmail.com>
 ---
  .../net/wireless/ralink/rt2x00/rt2800lib.c    | 65 +++++++++++++++++++
@@ -14,7 +28,7 @@ Signed-off-by: Tomislav Požega <pozega.tomislav@gmail.com>
 
 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
-@@ -8637,6 +8637,70 @@ static void rt2800_r_calibration(struct
+@@ -8632,6 +8632,70 @@ static void rt2800_r_calibration(struct
        rt2800_register_write(rt2x00dev, PWR_PIN_CFG, MAC_PWR_PIN_CFG);
  }
  
@@ -41,12 +55,12 @@ Signed-off-by: Tomislav Požega <pozega.tomislav@gmail.com>
 +      for (i = 0; i < 10000; i++) {
 +              macvalue1 = rt2800_register_read(rt2x00dev, MAC_STATUS_CFG);
 +              if (macvalue1 & 0x1)
-+                      udelay(50);
++                      usleep_range(50, 100);
 +              else
 +                      break;
 +      }
 +
-+      saverfb5r4 = rt2800_rfcsr_read_bank(rt2x00dev, 5, 0);
++      saverfb5r4 = rt2800_rfcsr_read_bank(rt2x00dev, 5, 4);
 +      saverfb7r4 = rt2800_rfcsr_read_bank(rt2x00dev, 7, 4);
 +      saverfb5r4 = saverfb5r4 & (~0x40);
 +      saverfb7r4 = saverfb7r4 & (~0x40);
@@ -63,9 +77,9 @@ Signed-off-by: Tomislav Požega <pozega.tomislav@gmail.com>
 +
 +      for (i = 0; i < 10000; i++) {
 +              bbpreg = rt2800_bbp_read(rt2x00dev, 159);
-+              if ((bbpreg & 0x40)==0)
++              if ((bbpreg & 0x40) == 0)
 +                      break;
-+              udelay(50);
++              usleep_range(50, 100);
 +      }
 +
 +      bbpreg = rt2800_bbp_read(rt2x00dev, 159);
@@ -85,7 +99,7 @@ Signed-off-by: Tomislav Požega <pozega.tomislav@gmail.com>
  static void rt2800_bbp_core_soft_reset(struct rt2x00_dev *rt2x00dev,
                                       bool set_bw, bool is_ht40)
  {
-@@ -9246,6 +9310,7 @@ static void rt2800_init_rfcsr_6352(struc
+@@ -9241,6 +9305,7 @@ static void rt2800_init_rfcsr_6352(struc
  
        rt2800_r_calibration(rt2x00dev);
        rt2800_rf_self_txdc_cal(rt2x00dev);