Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7aca1488 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Kalle Valo
Browse files

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: 41977e86 ("rt2x00: add support for MT7620")
Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 9ad3b556

drivers/net/wireless/ralink/rt2x00/rt2800lib.c

+4 −3
Original line number Diff line number Diff line
@@ -3858,10 +3858,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:
@@ -3916,7 +3918,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);