You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From 7aca14885edeab536a8cbe1e7cfeadd4c3310b9b Mon Sep 17 00:00:00 2001
|
|
From: Stanislaw Gruszka <sgruszka@redhat.com>
|
|
Date: Wed, 13 Feb 2019 11:09:15 +0100
|
|
Subject: [PATCH 18/28] rt2800: enable TX_PIN_CFG_RFRX_EN only for MT7620
|
|
|
|
The TX_PIN_CFG_RFRX_EN bit was not set on other devices than MT7620,
|
|
restore old behavaviour since setting this bit maight not be
|
|
correct for older devices.
|
|
|
|
Fixes: 41977e86c984 ("rt2x00: add support for MT7620")
|
|
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
@@ -3858,10 +3858,12 @@ static void rt2800_config_channel(struct
|
|
if (rt2x00_rt(rt2x00dev, RT3572))
|
|
rt2800_rfcsr_write(rt2x00dev, 8, 0);
|
|
|
|
- if (rt2x00_rt(rt2x00dev, RT6352))
|
|
+ if (rt2x00_rt(rt2x00dev, RT6352)) {
|
|
tx_pin = rt2800_register_read(rt2x00dev, TX_PIN_CFG);
|
|
- else
|
|
+ rt2x00_set_field32(&tx_pin, TX_PIN_CFG_RFRX_EN, 1);
|
|
+ } else {
|
|
tx_pin = 0;
|
|
+ }
|
|
|
|
switch (rt2x00dev->default_ant.tx_chain_num) {
|
|
case 3:
|
|
@@ -3916,7 +3918,6 @@ static void rt2800_config_channel(struct
|
|
|
|
rt2x00_set_field32(&tx_pin, TX_PIN_CFG_RFTR_EN, 1);
|
|
rt2x00_set_field32(&tx_pin, TX_PIN_CFG_TRSW_EN, 1);
|
|
- rt2x00_set_field32(&tx_pin, TX_PIN_CFG_RFRX_EN, 1); /* mt7620 */
|
|
|
|
rt2800_register_write(rt2x00dev, TX_PIN_CFG, tx_pin);
|
|
|