Skip to contentSkip to conversation

rt2800: fix TX_PIN_CFG setting for non MT7620 chips

PATCH In review Stanislaw Gruszka 2 participants 2 messages Sep 11, 2017

Subsystems (2)
Stable branch Ralink RT2X00 wireless LAN driver
lore
Share & tools
lore

Stanislaw Gruszka

author
#0 lore raw

PATCH 1/1 rt2800: fix TX_PIN_CFG setting for non MT7620 chips

commit 83ec489193894e52bd395eec470f4f7c4286d4a5 upstream.

Since commit 41977e86c984 ("rt2x00: add support for MT7620") we do not initialize TX_PIN_CFG setting. This cause breakage at least on some RT3573 devices. To fix the problem patch restores previous behaviour for non MT7620 chips.

Fixes 41977e86c984 ("rt2x00: add support for MT7620")

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1480829

Reported-and-tested-by Jussi Eloranta <[email protected]>
Signed-off-by Stanislaw Gruszka <[email protected]>
---
 drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

This fix should be applied to 4.12 and 4.13 trees. Patch for 4.13 is the same as commited to Linus tree.

drivers/net/wireless/ralink/rt2x00/rt2800lib.c +4 -1
index d11c7b2..5672aec 100644
@@ -3699,7 +3699,10 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
 	if (rt2x00_rt(rt2x00dev, RT3572))
 		rt2800_rfcsr_write(rt2x00dev, 8, 0);
 
-	rt2800_register_read(rt2x00dev, TX_PIN_CFG, &tx_pin);
+	if (rt2x00_rt(rt2x00dev, RT6352))
+		rt2800_register_read(rt2x00dev, TX_PIN_CFG, &tx_pin);
+	else
+		tx_pin = 0;
 
 	switch (rt2x00dev->default_ant.tx_chain_num) {
 	case 3:
Signature · 1 line
2.7.5
#1 lore raw
Quoted 9 lines · Stanislaw Gruszka

commit 83ec489193894e52bd395eec470f4f7c4286d4a5 upstream.

Since commit 41977e86c984 ("rt2x00: add support for MT7620") we do not initialize TX_PIN_CFG setting. This cause breakage at least on some RT3573 devices. To fix the problem patch restores previous behaviour for non MT7620 chips.

Fixes 41977e86c984 ("rt2x00: add support for MT7620")

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1480829

Quoted 8 lines
Reported-and-tested-by Jussi Eloranta <[email protected]>
Signed-off-by Stanislaw Gruszka <[email protected]>
---
 drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

This fix should be applied to 4.12 and 4.13 trees. Patch for 4.13 is the same as commited to Linus tree.

Thanks, now queued up.

greg k-h