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

Commit 8f96e91f authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

rt2x00: Don't disable G0 PA_PE bit in case of BT coexistence. 



(split off from the earlier RT35xx patch submitted by Shiang)

Signed-off-by: default avatarShiang Tu <shiang_tu@ralinktech.com>
Signed-off-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 65f31b5e

drivers/net/wireless/rt2x00/rt2800lib.c

+5 −1
Original line number Diff line number Diff line
@@ -1811,7 +1811,11 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, 
	rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G0_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_PA_PE_G0_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);

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



	rt2800_register_write(rt2x00dev, TX_PIN_CFG, tx_pin);