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

Commit f1f12f98 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

rt2800: radio 3xxxx: channel switch RX/TX calibration fixes 



Synchronize code with Ralink driver:
2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO
Based on functions:
RT30xx_ChipSwitchChannel
RT33xx_ChipSwitchChannel
NICInitRT3370RFRegisters
and defines from:
include/chip/rt33xx.h

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3e0c7643

drivers/net/wireless/rt2x00/rt2800.h

+8 −0
Original line number Diff line number Diff line
@@ -1871,6 +1871,13 @@ struct mac_iveiv_entry { 
 */

#define RFCSR23_FREQ_OFFSET		FIELD8(0x7f)



/*

 * RFCSR 24:

 */

#define RFCSR24_TX_AGC_FC		FIELD8(0x1f)

#define RFCSR24_TX_H20M			FIELD8(0x20)

#define RFCSR24_TX_CALIB		FIELD8(0x7f)



/*

 * RFCSR 27:

 */
@@ -1892,6 +1899,7 @@ struct mac_iveiv_entry { 
 */

#define RFCSR31_RX_AGC_FC		FIELD8(0x1f)

#define RFCSR31_RX_H20M			FIELD8(0x20)

#define RFCSR31_RX_CALIB		FIELD8(0x7f)



/*

 * RFCSR 38:

drivers/net/wireless/rt2x00/rt2800lib.c

+16 −3
Original line number Diff line number Diff line
@@ -1645,7 +1645,7 @@ static void rt2800_config_channel_rf3xxx(struct rt2x00_dev *rt2x00dev, 
					 struct rf_channel *rf,

					 struct channel_info *info)

{

	u8 rfcsr;

	u8 rfcsr, calib_tx, calib_rx;



	rt2800_rfcsr_write(rt2x00dev, 2, rf->rf1);
@@ -1710,8 +1710,21 @@ static void rt2800_config_channel_rf3xxx(struct rt2x00_dev *rt2x00dev, 
	rt2x00_set_field8(&rfcsr, RFCSR23_FREQ_OFFSET, rt2x00dev->freq_offset);

	rt2800_rfcsr_write(rt2x00dev, 23, rfcsr);



	rt2800_rfcsr_write(rt2x00dev, 24,

			      rt2x00dev->calibration[conf_is_ht40(conf)]);

	if (rt2x00_rt(rt2x00dev, RT3390)) {

		calib_tx = conf_is_ht40(conf) ? 0x68 : 0x4f;

		calib_rx = conf_is_ht40(conf) ? 0x6f : 0x4f;

	} else {

		calib_tx = rt2x00dev->calibration[conf_is_ht40(conf)];

		calib_rx = rt2x00dev->calibration[conf_is_ht40(conf)];

	}



	rt2800_rfcsr_read(rt2x00dev, 24, &rfcsr);

	rt2x00_set_field8(&rfcsr, RFCSR24_TX_CALIB, calib_tx);

	rt2800_rfcsr_write(rt2x00dev, 24, rfcsr);



	rt2800_rfcsr_read(rt2x00dev, 31, &rfcsr);

	rt2x00_set_field8(&rfcsr, RFCSR31_RX_CALIB, calib_rx);

	rt2800_rfcsr_write(rt2x00dev, 31, rfcsr);



	rt2800_rfcsr_read(rt2x00dev, 7, &rfcsr);

	rt2x00_set_field8(&rfcsr, RFCSR7_RF_TUNING, 1);