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

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

rt2x00: Update rt2800 register definitions towards latest definitions. 



Definitions taken from the latest rt2860 / rt2870 / rt3070 / rt3090 Ralink
vendor drivers.

Signed-off-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 06855ef4

drivers/net/wireless/rt2x00/rt2800.h

+53 −2
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#define RF3021				0x0007

#define RF3022				0x0008

#define RF3052				0x0009

#define RF3320				0x000b



/*

 * Chipset version.
@@ -90,9 +91,15 @@ 
#define NUM_TX_QUEUES			4



/*

 * USB registers.

 * Registers.

 */



/*

 * OPT_14: Unknown register used by rt3xxx devices.

 */

#define OPT_14_CSR			0x0114

#define OPT_14_CSR_BIT0			FIELD32(0x00000001)



/*

 * INT_SOURCE_CSR: Interrupt source register.

 * Write one to clear corresponding bit.
@@ -397,6 +404,31 @@ 
 */

#define EFUSE_DATA3			0x059c



/*

 * LDO_CFG0

 */

#define LDO_CFG0			0x05d4

#define LDO_CFG0_DELAY3			FIELD32(0x000000ff)

#define LDO_CFG0_DELAY2			FIELD32(0x0000ff00)

#define LDO_CFG0_DELAY1			FIELD32(0x00ff0000)

#define LDO_CFG0_BGSEL			FIELD32(0x03000000)

#define LDO_CFG0_LDO_CORE_VLEVEL	FIELD32(0x1c000000)

#define LD0_CFG0_LDO25_LEVEL		FIELD32(0x60000000)

#define LDO_CFG0_LDO25_LARGEA		FIELD32(0x80000000)



/*

 * GPIO_SWITCH

 */

#define GPIO_SWITCH			0x05dc

#define GPIO_SWITCH_0			FIELD32(0x00000001)

#define GPIO_SWITCH_1			FIELD32(0x00000002)

#define GPIO_SWITCH_2			FIELD32(0x00000004)

#define GPIO_SWITCH_3			FIELD32(0x00000008)

#define GPIO_SWITCH_4			FIELD32(0x00000010)

#define GPIO_SWITCH_5			FIELD32(0x00000020)

#define GPIO_SWITCH_6			FIELD32(0x00000040)

#define GPIO_SWITCH_7			FIELD32(0x00000080)



/*

 * MAC Control/Status Registers(CSR).

 * Some values are set in TU, whereas 1 TU == 1024 us.
@@ -1491,6 +1523,14 @@ struct mac_iveiv_entry { 
#define BBP4_TX_BF			FIELD8(0x01)

#define BBP4_BANDWIDTH			FIELD8(0x18)



/*

 * BBP 138: Unknown

 */

#define BBP138_RX_ADC1			FIELD8(0x02)

#define BBP138_RX_ADC2			FIELD8(0x04)

#define BBP138_TX_DAC1			FIELD8(0x20)

#define BBP138_TX_DAC2			FIELD8(0x40)



/*

 * RFCSR registers

 * The wordsize of the RFCSR is 8 bits.
@@ -1499,7 +1539,8 @@ struct mac_iveiv_entry { 
/*

 * RFCSR 6:

 */

#define RFCSR6_R			FIELD8(0x03)

#define RFCSR6_R1			FIELD8(0x03)

#define RFCSR6_R2			FIELD8(0x40)



/*

 * RFCSR 7:
@@ -1511,6 +1552,14 @@ struct mac_iveiv_entry { 
 */

#define RFCSR12_TX_POWER		FIELD8(0x1f)



/*

 * RFCSR 17:

 */

#define RFCSR17_R1			FIELD8(0x07)

#define RFCSR17_R2			FIELD8(0x08)

#define RFCSR17_R3			FIELD8(0x20)





/*

 * RFCSR 22:

 */
@@ -1603,6 +1652,8 @@ struct mac_iveiv_entry { 
#define EEPROM_NIC_WPS_PBC		FIELD16(0x0080)

#define EEPROM_NIC_BW40M_BG		FIELD16(0x0100)

#define EEPROM_NIC_BW40M_A		FIELD16(0x0200)

#define EEPROM_NIC_ANT_DIVERSITY	FIELD16(0x0800)

#define EEPROM_NIC_DAC_TEST		FIELD16(0x8000)



/*

 * EEPROM frequency

drivers/net/wireless/rt2x00/rt2800lib.c

+1 −1
Original line number Diff line number Diff line
@@ -797,7 +797,7 @@ static void rt2800_config_channel_rf3xxx(struct rt2x00_dev *rt2x00dev, 
	rt2800_rfcsr_write(rt2x00dev, 3, rf->rf3);



	rt2800_rfcsr_read(rt2x00dev, 6, &rfcsr);

	rt2x00_set_field8(&rfcsr, RFCSR6_R, rf->rf2);

	rt2x00_set_field8(&rfcsr, RFCSR6_R1, rf->rf2);

	rt2800_rfcsr_write(rt2x00dev, 6, rfcsr);



	rt2800_rfcsr_read(rt2x00dev, 12, &rfcsr);