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

Commit bb16d488 authored by Gabor Juhos's avatar Gabor Juhos Committed by John W. Linville
Browse files

rt2x00: rt2800lib: turn on tertiary PAs/LNAs for 3T/3R devices 



The 3T/3R devices are using the tertiary PAs/LNAs
however those are never turned on. Fix the code to
turn on those on for such devices.

Also modify the code to use switch statements to
improve readability.

Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3e23d4e8

drivers/net/wireless/rt2x00/rt2800lib.c

+35 −12
Original line number Original line Diff line number Diff line
@@ -2678,30 +2678,53 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, 




	tx_pin = 0;

	tx_pin = 0;





	if (rt2x00dev->default_ant.tx_chain_num > 1) {

	switch (rt2x00dev->default_ant.tx_chain_num) {

		/* Turn on secondary PAs for 2T and for 3T devices*/

	case 3:

		/* Turn on tertiary PAs */

		rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_A2_EN,

				   rf->channel > 14);

		rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G2_EN,

				   rf->channel <= 14);

		/* fall-through */

	case 2:

		/* Turn on secondary PAs */

		rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_A1_EN,

		rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_A1_EN,

				   rf->channel > 14);

				   rf->channel > 14);

		rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G1_EN,

		rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G1_EN,

				   rf->channel <= 14);

				   rf->channel <= 14);

		/* fall-through */

	case 1:

		/* Turn on primary PAs */

		rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_A0_EN,

				   rf->channel > 14);

		if (test_bit(CAPABILITY_BT_COEXIST, &rt2x00dev->cap_flags))

			rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G0_EN, 1);

		else

			rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G0_EN,

					   rf->channel <= 14);

		break;

	}

	}





	if (rt2x00dev->default_ant.rx_chain_num > 1) {

	switch (rt2x00dev->default_ant.rx_chain_num) {

		/* Turn on secondary LNAs for 2R and for 3R devices */

	case 3:

		/* Turn on tertiary LNAs */

		rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A2_EN, 1);

		rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G2_EN, 1);

		/* fall-through */

	case 2:

		/* Turn on secondary LNAs */

		rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A1_EN, 1);

		rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A1_EN, 1);

		rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G1_EN, 1);

		rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G1_EN, 1);

	}

		/* fall-through */



	case 1:

		/* Turn on primary LNAs */

		rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A0_EN, 1);

		rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A0_EN, 1);

		rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G0_EN, 1);

		rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G0_EN, 1);

		break;

	}



	rt2x00_set_field32(&tx_pin, TX_PIN_CFG_RFTR_EN, 1);

	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_TRSW_EN, 1);

	if (test_bit(CAPABILITY_BT_COEXIST, &rt2x00dev->cap_flags))

		rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G0_EN, 1);

	else

		rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G0_EN,

				   rf->channel <= 14);

	rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_A0_EN, rf->channel > 14);





	rt2800_register_write(rt2x00dev, TX_PIN_CFG, tx_pin);

	rt2800_register_write(rt2x00dev, TX_PIN_CFG, tx_pin);