linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stanislaw Gruszka <sgruszka@redhat.com>
To: linux-wireless@vger.kernel.org
Cc: "Daniel Golle" <daniel@makrotopia.org>,
	"Mathias Kresin" <dev@kresin.me>, "Felix Fietkau" <nbd@nbd.name>,
	"Tomislav Požega" <pozega.tomislav@gmail.com>
Subject: [PATCH v4 6/8] rt2800: enable TX_PIN_CFG_RFRX_EN only for MT7620
Date: Fri, 12 Oct 2018 10:56:29 +0200	[thread overview]
Message-ID: <1539334591-9965-7-git-send-email-sgruszka@redhat.com> (raw)
In-Reply-To: <1539334591-9965-1-git-send-email-sgruszka@redhat.com>

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>
---
 drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
index bf0d12c5b2db..d0af0d9d2550 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
@@ -3856,10 +3856,12 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
 	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:
@@ -3914,7 +3916,6 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
 
 	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);
 
-- 
2.7.5


  parent reply	other threads:[~2018-10-12  8:56 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-12  8:56 [PATCH v4 0/8] rt2800: register programing tweaks and clean ups Stanislaw Gruszka
2018-10-12  8:56 ` [PATCH v4 1/8] rt2x00: remove unneeded check Stanislaw Gruszka
2018-10-12  8:56 ` [PATCH v4 2/8] rt2x00: remove confusing AGC register Stanislaw Gruszka
2018-10-12  8:56 ` [PATCH v4 3/8] rt2x00: update TX_SW_CFG2 value Stanislaw Gruszka
2018-10-12  8:56 ` [PATCH v4 4/8] rt2800: fix registers init for MT7620 Stanislaw Gruszka
2018-10-12 10:48   ` Tom Psyborg
2018-10-12 11:36     ` Stanislaw Gruszka
2018-10-12 11:51       ` Tom Psyborg
2018-10-12 12:03         ` Stanislaw Gruszka
2018-10-12 12:20           ` Tom Psyborg
2018-10-12 12:26             ` Stanislaw Gruszka
2018-10-12 12:41               ` Tom Psyborg
2018-10-16  8:09                 ` Stanislaw Gruszka
2018-10-16 11:19                   ` Felix Fietkau
2018-10-16 11:21                     ` Stanislaw Gruszka
2018-10-16 11:25                       ` Felix Fietkau
2018-10-16 11:32                   ` Tom Psyborg
2018-10-16 15:49                     ` Stanislaw Gruszka
2018-10-17 13:25                       ` Tom Psyborg
2018-10-19  9:00                         ` Stanislaw Gruszka
2018-10-19 14:21                           ` Tom Psyborg
2018-10-20  9:44                             ` Stanislaw Gruszka
2018-10-18 15:51                       ` Tom Psyborg
2018-10-16  8:11     ` Stanislaw Gruszka
2018-10-16 10:38       ` Daniel Golle
2018-10-13  9:46   ` Kalle Valo
2018-10-16  8:02     ` Stanislaw Gruszka
2018-10-12  8:56 ` [PATCH v4 5/8] rt2800: enable TX_PIN_CFG_LNA_PE_ bits per band Stanislaw Gruszka
2018-10-12  8:56 ` Stanislaw Gruszka [this message]
2018-10-12 10:52   ` [PATCH v4 6/8] rt2800: enable TX_PIN_CFG_RFRX_EN only for MT7620 Tom Psyborg
2018-10-12 11:38     ` Stanislaw Gruszka
2018-10-12  8:56 ` [PATCH v4 7/8] rt2800: remove unneeded RT6352 check Stanislaw Gruszka
2018-10-12  8:56 ` [PATCH v4 8/8] rt2800: comment and simplify AGC init for RT6352 Stanislaw Gruszka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1539334591-9965-7-git-send-email-sgruszka@redhat.com \
    --to=sgruszka@redhat.com \
    --cc=daniel@makrotopia.org \
    --cc=dev@kresin.me \
    --cc=linux-wireless@vger.kernel.org \
    --cc=nbd@nbd.name \
    --cc=pozega.tomislav@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).