From 8554982e1fd0c8f25e5f154b046eb955f6af2019 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 19 Feb 2019 18:30:24 +0100 Subject: [PATCH] mac80211: rt2x00: replace pending by merged patches Those have by now been merged into wireless-drivers-next: 17ae2acd1a6f rt2x00: remove unneeded check 5991a2ecd070 rt2x00: remove confusing AGC register 9ad3b5565445 rt2800: enable TX_PIN_CFG_LNA_PE_ bits per band 7aca14885ede rt2800: enable TX_PIN_CFG_RFRX_EN only for MT7620 c7ff1bfeaf1c rt2800: comment and simplify AGC init for RT6352 Signed-off-by: Daniel Golle --- .../patches/rt2x00/015-rt2x00-remove-unneeded-check.patch | 3 ++- .../rt2x00/016-rt2x00-remove-confusing-AGC-register.patch | 3 ++- .../017-rt2800-enable-TX_PIN_CFG_LNA_PE_-bits-per-band.patch | 3 ++- .../018-rt2800-enable-TX_PIN_CFG_RFRX_EN-only-for-MT7620.patch | 3 ++- .../019-rt2800-comment-and-simplify-AGC-init-for-RT6352.patch | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/package/kernel/mac80211/patches/rt2x00/015-rt2x00-remove-unneeded-check.patch b/package/kernel/mac80211/patches/rt2x00/015-rt2x00-remove-unneeded-check.patch index f896ea5bcbc4..50e7de085575 100644 --- a/package/kernel/mac80211/patches/rt2x00/015-rt2x00-remove-unneeded-check.patch +++ b/package/kernel/mac80211/patches/rt2x00/015-rt2x00-remove-unneeded-check.patch @@ -1,4 +1,4 @@ -From 0bffbc98e6999bba38d8185a0ddb1ee77369eaec Mon Sep 17 00:00:00 2001 +From 17ae2acd1a6f5148edd80d84194e5d7c80be360e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomislav=20Po=C5=BEega?= Date: Wed, 13 Feb 2019 11:09:12 +0100 Subject: [PATCH 15/28] rt2x00: remove unneeded check @@ -11,6 +11,7 @@ using it are single band. Signed-off-by: Tomislav Požega Signed-off-by: Stanislaw Gruszka +Signed-off-by: Kalle Valo --- .../net/wireless/ralink/rt2x00/rt2800lib.c | 103 +++++++++--------- 1 file changed, 50 insertions(+), 53 deletions(-) diff --git a/package/kernel/mac80211/patches/rt2x00/016-rt2x00-remove-confusing-AGC-register.patch b/package/kernel/mac80211/patches/rt2x00/016-rt2x00-remove-confusing-AGC-register.patch index 194e1d8154bc..8f3791d2ce7f 100644 --- a/package/kernel/mac80211/patches/rt2x00/016-rt2x00-remove-confusing-AGC-register.patch +++ b/package/kernel/mac80211/patches/rt2x00/016-rt2x00-remove-confusing-AGC-register.patch @@ -1,4 +1,4 @@ -From dce31f739d4c901725a23c7939d7e04d4c2eacac Mon Sep 17 00:00:00 2001 +From 5991a2ecd070ce5ef646b4e8e0bc8d99110604ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomislav=20Po=C5=BEega?= Date: Wed, 13 Feb 2019 11:09:13 +0100 Subject: [PATCH 16/28] rt2x00: remove confusing AGC register @@ -12,6 +12,7 @@ and HT40 modes. Signed-off-by: Tomislav Požega Signed-off-by: Stanislaw Gruszka +Signed-off-by: Kalle Valo --- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package/kernel/mac80211/patches/rt2x00/017-rt2800-enable-TX_PIN_CFG_LNA_PE_-bits-per-band.patch b/package/kernel/mac80211/patches/rt2x00/017-rt2800-enable-TX_PIN_CFG_LNA_PE_-bits-per-band.patch index a469fae69c76..eb82d6275b6d 100644 --- a/package/kernel/mac80211/patches/rt2x00/017-rt2800-enable-TX_PIN_CFG_LNA_PE_-bits-per-band.patch +++ b/package/kernel/mac80211/patches/rt2x00/017-rt2800-enable-TX_PIN_CFG_LNA_PE_-bits-per-band.patch @@ -1,4 +1,4 @@ -From 9c9bf1af644ad16fca1fd601cfc3a2a2c6bbc58b Mon Sep 17 00:00:00 2001 +From 9ad3b55654455258a9463384edb40077439d879f Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka Date: Wed, 13 Feb 2019 11:09:14 +0100 Subject: [PATCH 17/28] rt2800: enable TX_PIN_CFG_LNA_PE_ bits per band @@ -7,6 +7,7 @@ Do not enable TX_PIN_CFG_LNA_PE_A* bits for 2.4GHz band and vice versa TX_PIN_CFG_LNA_PE_G* bits for 5GHz. Signed-off-by: Stanislaw Gruszka +Signed-off-by: Kalle Valo --- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/package/kernel/mac80211/patches/rt2x00/018-rt2800-enable-TX_PIN_CFG_RFRX_EN-only-for-MT7620.patch b/package/kernel/mac80211/patches/rt2x00/018-rt2800-enable-TX_PIN_CFG_RFRX_EN-only-for-MT7620.patch index 445e3eade65c..3a4c2cd8e522 100644 --- a/package/kernel/mac80211/patches/rt2x00/018-rt2800-enable-TX_PIN_CFG_RFRX_EN-only-for-MT7620.patch +++ b/package/kernel/mac80211/patches/rt2x00/018-rt2800-enable-TX_PIN_CFG_RFRX_EN-only-for-MT7620.patch @@ -1,4 +1,4 @@ -From 4c0475ad8b73072b5b638163c2eb8309310406ed Mon Sep 17 00:00:00 2001 +From 7aca14885edeab536a8cbe1e7cfeadd4c3310b9b Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka Date: Wed, 13 Feb 2019 11:09:15 +0100 Subject: [PATCH 18/28] rt2800: enable TX_PIN_CFG_RFRX_EN only for MT7620 @@ -9,6 +9,7 @@ correct for older devices. Fixes: 41977e86c984 ("rt2x00: add support for MT7620") Signed-off-by: Stanislaw Gruszka +Signed-off-by: Kalle Valo --- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/kernel/mac80211/patches/rt2x00/019-rt2800-comment-and-simplify-AGC-init-for-RT6352.patch b/package/kernel/mac80211/patches/rt2x00/019-rt2800-comment-and-simplify-AGC-init-for-RT6352.patch index 936651c0baf7..4d0beb263d90 100644 --- a/package/kernel/mac80211/patches/rt2x00/019-rt2800-comment-and-simplify-AGC-init-for-RT6352.patch +++ b/package/kernel/mac80211/patches/rt2x00/019-rt2800-comment-and-simplify-AGC-init-for-RT6352.patch @@ -1,4 +1,4 @@ -From cb77f0f92f596a2ef54246db7321e319305e8156 Mon Sep 17 00:00:00 2001 +From c7ff1bfeaf1ca69e3e401be211b55d1738d0c5fc Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka Date: Wed, 13 Feb 2019 11:09:16 +0100 Subject: [PATCH 19/28] rt2800: comment and simplify AGC init for RT6352 @@ -8,6 +8,7 @@ Also add comment that value is different than in vendor driver. Suggested-by: Daniel Golle Signed-off-by: Stanislaw Gruszka +Signed-off-by: Kalle Valo --- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- 2.30.2