From f0aff72c2bfae884b5482a288a191cc33a37f66b Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Fri, 13 Mar 2020 14:07:23 +0100 Subject: mac80211: Update to version 5.4.27 The removed patches are all integrated in the upstream version now. Signed-off-by: Hauke Mehrtens --- ...2800-remove-errornous-duplicate-condition.patch | 88 ---------------------- .../612-rt2x00-led-tpt-trigger-support.patch | 2 +- 2 files changed, 1 insertion(+), 89 deletions(-) delete mode 100644 package/kernel/mac80211/patches/rt2x00/020-rt2800-remove-errornous-duplicate-condition.patch (limited to 'package/kernel/mac80211/patches/rt2x00') diff --git a/package/kernel/mac80211/patches/rt2x00/020-rt2800-remove-errornous-duplicate-condition.patch b/package/kernel/mac80211/patches/rt2x00/020-rt2800-remove-errornous-duplicate-condition.patch deleted file mode 100644 index 91d12b51a2..0000000000 --- a/package/kernel/mac80211/patches/rt2x00/020-rt2800-remove-errornous-duplicate-condition.patch +++ /dev/null @@ -1,88 +0,0 @@ -From patchwork Sat Nov 2 17:47:01 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Daniel Golle -X-Patchwork-Id: 11224189 -X-Patchwork-Delegate: kvalo@adurom.com -Return-Path: -Date: Sat, 2 Nov 2019 18:47:01 +0100 -From: Daniel Golle -To: Stanislaw Gruszka -Cc: linux-wireless@vger.kernel.org, Roman Yeryomin , - wbob -Subject: [PATCH v2] rt2800: remove errornous duplicate condition -Message-ID: <20191102174701.GA1489@makrotopia.org> -References: <20191102154639.GA4589@redhat.com> -MIME-Version: 1.0 -Content-Disposition: inline -In-Reply-To: <20191102154639.GA4589@redhat.com> -User-Agent: Mutt/1.12.2 (2019-09-21) -Sender: linux-wireless-owner@vger.kernel.org -Precedence: bulk -List-ID: -X-Mailing-List: linux-wireless@vger.kernel.org - -On 2019-10-28 06:07, wbob wrote: -> Hello Roman, -> -> while reading around drivers/net/wireless/ralink/rt2x00/rt2800lib.c -> I stumbled on what I think is an edit of yours made in error in march -> 2017: -> -> https://github.com/torvalds/linux/commit/41977e86#diff-dae5dc10da180f3b055809a48118e18aR5281 -> -> RT6352 in line 5281 should not have been introduced as the "else if" -> below line 5291 can then not take effect for a RT6352 device. Another -> possibility is for line 5291 to be not for RT6352, but this seems -> very unlikely. Are you able to clarify still after this substantial time? -> -> 5277: static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev) -> ... -> 5279: } else if (rt2x00_rt(rt2x00dev, RT5390) || -> 5280: rt2x00_rt(rt2x00dev, RT5392) || -> 5281: rt2x00_rt(rt2x00dev, RT6352)) { -> ... -> 5291: } else if (rt2x00_rt(rt2x00dev, RT6352)) { -> ... - -Hence remove errornous line 5281 to make the driver actually -execute the correct initialization routine for MT7620 chips. - -As it was requested by Stanislaw Gruszka remove setting values of -MIMO_PS_CFG and TX_PIN_CFG. MIMO_PS_CFG is responsible for MIMO -power-safe mode (which is disabled), hence we can drop setting it. -TX_PIN_CFG is set correctly in other functions, and as setting this -value breaks some devices, rather don't set it here during init, but -only modify it later on. - -Fixes: 41977e86c984 ("rt2x00: add support for MT7620") -Reported-by: wbob -Reported-by: Roman Yeryomin -Signed-off-by: Daniel Golle -Acked-by: Stanislaw Gruszka ---- - drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - ---- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -5839,8 +5839,7 @@ static int rt2800_init_registers(struct - rt2800_register_write(rt2x00dev, TX_TXBF_CFG_0, 0x8000fc21); - rt2800_register_write(rt2x00dev, TX_TXBF_CFG_3, 0x00009c40); - } else if (rt2x00_rt(rt2x00dev, RT5390) || -- rt2x00_rt(rt2x00dev, RT5392) || -- rt2x00_rt(rt2x00dev, RT6352)) { -+ rt2x00_rt(rt2x00dev, RT5392)) { - rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404); - rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606); - rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000); -@@ -5854,8 +5853,6 @@ static int rt2800_init_registers(struct - rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000401); - rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x000C0000); - rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000); -- rt2800_register_write(rt2x00dev, MIMO_PS_CFG, 0x00000002); -- rt2800_register_write(rt2x00dev, TX_PIN_CFG, 0x00150F0F); - rt2800_register_write(rt2x00dev, TX_ALC_VGA3, 0x00000000); - rt2800_register_write(rt2x00dev, TX0_BB_GAIN_ATTEN, 0x0); - rt2800_register_write(rt2x00dev, TX1_BB_GAIN_ATTEN, 0x0); diff --git a/package/kernel/mac80211/patches/rt2x00/612-rt2x00-led-tpt-trigger-support.patch b/package/kernel/mac80211/patches/rt2x00/612-rt2x00-led-tpt-trigger-support.patch index 25d15b617f..70f8d06e24 100644 --- a/package/kernel/mac80211/patches/rt2x00/612-rt2x00-led-tpt-trigger-support.patch +++ b/package/kernel/mac80211/patches/rt2x00/612-rt2x00-led-tpt-trigger-support.patch @@ -31,7 +31,7 @@ Tested-by: Christoph Krapp static int rt2x00lib_probe_hw(struct rt2x00_dev *rt2x00dev) { struct hw_mode_spec *spec = &rt2x00dev->spec; -@@ -1211,6 +1225,10 @@ static int rt2x00lib_probe_hw(struct rt2 +@@ -1211,6 +1224,10 @@ static int rt2x00lib_probe_hw(struct rt2 #undef RT2X00_TASKLET_INIT -- cgit v1.2.3