1 --- a/drivers/net/wireless/rt2x00/rt2800lib.c
2 +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
3 @@ -2249,15 +2249,18 @@ static void rt2800_config_channel(struct
7 + rt2800_bbp_write(rt2x00dev, 62, 0x37 - rt2x00dev->lna_gain);
8 + rt2800_bbp_write(rt2x00dev, 63, 0x37 - rt2x00dev->lna_gain);
9 + rt2800_bbp_write(rt2x00dev, 64, 0x37 - rt2x00dev->lna_gain);
11 if (rt2x00_rt(rt2x00dev, RT3352)) {
12 rt2800_bbp_write(rt2x00dev, 27, 0x0);
13 rt2800_bbp_write(rt2x00dev, 66, 0x26 + rt2x00dev->lna_gain);
14 rt2800_bbp_write(rt2x00dev, 27, 0x20);
15 rt2800_bbp_write(rt2x00dev, 66, 0x26 + rt2x00dev->lna_gain);
16 + rt2800_bbp_write(rt2x00dev, 86, 0x38);
17 + rt2800_bbp_write(rt2x00dev, 83, 0x6a);
19 - rt2800_bbp_write(rt2x00dev, 62, 0x37 - rt2x00dev->lna_gain);
20 - rt2800_bbp_write(rt2x00dev, 63, 0x37 - rt2x00dev->lna_gain);
21 - rt2800_bbp_write(rt2x00dev, 64, 0x37 - rt2x00dev->lna_gain);
22 rt2800_bbp_write(rt2x00dev, 86, 0);
25 @@ -3670,6 +3673,7 @@ static int rt2800_init_bbp(struct rt2x00
26 rt2800_bbp_write(rt2x00dev, 120, 0x50);
28 if (rt2x00_rt(rt2x00dev, RT3290) ||
29 + rt2x00_rt(rt2x00dev, RT3352) ||
30 rt2x00_rt(rt2x00dev, RT5390) ||
31 rt2x00_rt(rt2x00dev, RT5392))
32 rt2800_bbp_write(rt2x00dev, 128, 0x12);
33 @@ -3976,6 +3980,12 @@ static void rt2800_init_rfcsr_3290(struc
35 static void rt2800_init_rfcsr_3352(struct rt2x00_dev *rt2x00dev)
37 + int tx0_int_pa = test_bit(CAPABILITY_INTERNAL_PA_TX0,
38 + &rt2x00dev->cap_flags);
39 + int tx1_int_pa = test_bit(CAPABILITY_INTERNAL_PA_TX1,
40 + &rt2x00dev->cap_flags);
43 rt2800_rfcsr_write(rt2x00dev, 0, 0xf0);
44 rt2800_rfcsr_write(rt2x00dev, 1, 0x23);
45 rt2800_rfcsr_write(rt2x00dev, 2, 0x50);
46 @@ -4009,15 +4019,30 @@ static void rt2800_init_rfcsr_3352(struc
47 rt2800_rfcsr_write(rt2x00dev, 31, 0x80);
48 rt2800_rfcsr_write(rt2x00dev, 32, 0x80);
49 rt2800_rfcsr_write(rt2x00dev, 33, 0x00);
50 - rt2800_rfcsr_write(rt2x00dev, 34, 0x01);
53 + rt2x00_set_field8(&rfcsr, RFCSR34_TX0_EXT_PA, 1);
55 + rt2x00_set_field8(&rfcsr, RFCSR34_TX1_EXT_PA, 1);
56 + rt2800_rfcsr_write(rt2x00dev, 34, rfcsr );
57 rt2800_rfcsr_write(rt2x00dev, 35, 0x03);
58 rt2800_rfcsr_write(rt2x00dev, 36, 0xbd);
59 rt2800_rfcsr_write(rt2x00dev, 37, 0x3c);
60 rt2800_rfcsr_write(rt2x00dev, 38, 0x5f);
61 rt2800_rfcsr_write(rt2x00dev, 39, 0xc5);
62 rt2800_rfcsr_write(rt2x00dev, 40, 0x33);
63 - rt2800_rfcsr_write(rt2x00dev, 41, 0x5b);
64 - rt2800_rfcsr_write(rt2x00dev, 42, 0x5b);
67 + rt2x00_set_field8(&rfcsr, RFCSR41_BIT1, 1);
68 + rt2x00_set_field8(&rfcsr, RFCSR41_BIT4, 1);
70 + rt2800_rfcsr_write(rt2x00dev, 41, rfcsr);
73 + rt2x00_set_field8(&rfcsr, RFCSR42_BIT1, 1);
74 + rt2x00_set_field8(&rfcsr, RFCSR42_BIT4, 1);
76 + rt2800_rfcsr_write(rt2x00dev, 42, rfcsr);
77 rt2800_rfcsr_write(rt2x00dev, 43, 0xdb);
78 rt2800_rfcsr_write(rt2x00dev, 44, 0xdb);
79 rt2800_rfcsr_write(rt2x00dev, 45, 0xdb);
80 @@ -4025,15 +4050,20 @@ static void rt2800_init_rfcsr_3352(struc
81 rt2800_rfcsr_write(rt2x00dev, 47, 0x0d);
82 rt2800_rfcsr_write(rt2x00dev, 48, 0x14);
83 rt2800_rfcsr_write(rt2x00dev, 49, 0x00);
84 - rt2800_rfcsr_write(rt2x00dev, 50, 0x2d);
85 - rt2800_rfcsr_write(rt2x00dev, 51, 0x7f);
86 - rt2800_rfcsr_write(rt2x00dev, 52, 0x00);
87 - rt2800_rfcsr_write(rt2x00dev, 53, 0x52);
88 - rt2800_rfcsr_write(rt2x00dev, 54, 0x1b);
89 - rt2800_rfcsr_write(rt2x00dev, 55, 0x7f);
90 - rt2800_rfcsr_write(rt2x00dev, 56, 0x00);
91 - rt2800_rfcsr_write(rt2x00dev, 57, 0x52);
92 - rt2800_rfcsr_write(rt2x00dev, 58, 0x1b);
95 + rt2x00_set_field8(&rfcsr, RFCSR50_TX0_EXT_PA, 1);
97 + rt2x00_set_field8(&rfcsr, RFCSR50_TX1_EXT_PA, 1);
98 + rt2800_rfcsr_write(rt2x00dev, 50, rfcsr);
99 + rt2800_rfcsr_write(rt2x00dev, 51, (tx0_int_pa ? 0x7f : 0x52));
100 + rt2800_rfcsr_write(rt2x00dev, 52, (tx0_int_pa ? 0x00 : 0xc0));
101 + rt2800_rfcsr_write(rt2x00dev, 53, (tx0_int_pa ? 0x52 : 0xd2));
102 + rt2800_rfcsr_write(rt2x00dev, 54, (tx0_int_pa ? 0x1b : 0xc0));
103 + rt2800_rfcsr_write(rt2x00dev, 55, (tx1_int_pa ? 0x7f : 0x52));
104 + rt2800_rfcsr_write(rt2x00dev, 56, (tx1_int_pa ? 0x00 : 0xc0));
105 + rt2800_rfcsr_write(rt2x00dev, 57, (tx0_int_pa ? 0x52 : 0x49));
106 + rt2800_rfcsr_write(rt2x00dev, 58, (tx1_int_pa ? 0x1b : 0xc0));
107 rt2800_rfcsr_write(rt2x00dev, 59, 0x00);
108 rt2800_rfcsr_write(rt2x00dev, 60, 0x00);
109 rt2800_rfcsr_write(rt2x00dev, 61, 0x00);
110 @@ -4949,7 +4979,8 @@ static int rt2800_init_eeprom(struct rt2
112 * Detect if this device has Bluetooth co-existence.
114 - if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF1_BT_COEXIST))
115 + if (!rt2x00_rt(rt2x00dev, RT3352) &&
116 + rt2x00_get_field16(eeprom, EEPROM_NIC_CONF1_BT_COEXIST))
117 __set_bit(CAPABILITY_BT_COEXIST, &rt2x00dev->cap_flags);
120 @@ -4978,6 +5009,22 @@ static int rt2800_init_eeprom(struct rt2
121 EIRP_MAX_TX_POWER_LIMIT)
122 __set_bit(CAPABILITY_POWER_LIMIT, &rt2x00dev->cap_flags);
125 + * Detect if device uses internal or external PA
127 + rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);
129 + if (rt2x00_rt(rt2x00dev, RT3352)) {
130 + if (!rt2x00_get_field16(eeprom,
131 + EEPROM_NIC_CONF1_EXTERNAL_TX0_PA_3352))
132 + __set_bit(CAPABILITY_INTERNAL_PA_TX0,
133 + &rt2x00dev->cap_flags);
134 + if (!rt2x00_get_field16(eeprom,
135 + EEPROM_NIC_CONF1_EXTERNAL_TX1_PA_3352))
136 + __set_bit(CAPABILITY_INTERNAL_PA_TX1,
137 + &rt2x00dev->cap_flags);
143 --- a/drivers/net/wireless/rt2x00/rt2800.h
144 +++ b/drivers/net/wireless/rt2x00/rt2800.h
145 @@ -2117,6 +2117,12 @@ struct mac_iveiv_entry {
146 #define RFCSR31_RX_CALIB FIELD8(0x7f)
151 +#define RFCSR34_TX0_EXT_PA FIELD8(0x04)
152 +#define RFCSR34_TX1_EXT_PA FIELD8(0x08)
157 #define RFCSR38_RX_LO1_EN FIELD8(0x20)
158 @@ -2127,6 +2133,18 @@ struct mac_iveiv_entry {
159 #define RFCSR39_RX_LO2_EN FIELD8(0x80)
164 +#define RFCSR41_BIT1 FIELD8(0x01)
165 +#define RFCSR41_BIT4 FIELD8(0x08)
170 +#define RFCSR42_BIT1 FIELD8(0x01)
171 +#define RFCSR42_BIT4 FIELD8(0x08)
176 #define RFCSR49_TX FIELD8(0x3f)
177 @@ -2135,6 +2153,8 @@ struct mac_iveiv_entry {
180 #define RFCSR50_TX FIELD8(0x3f)
181 +#define RFCSR50_TX0_EXT_PA FIELD8(0x02)
182 +#define RFCSR50_TX1_EXT_PA FIELD8(0x10)
186 @@ -2222,6 +2242,8 @@ struct mac_iveiv_entry {
187 * INTERNAL_TX_ALC: 0: disable, 1: enable
188 * BT_COEXIST: 0: disable, 1: enable
189 * DAC_TEST: 0: disable, 1: enable
190 + * EXTERNAL_TX0_PA: 0: disable, 1: enable (only on RT3352)
191 + * EXTERNAL_TX1_PA: 0: disable, 1: enable (only on RT3352)
193 #define EEPROM_NIC_CONF1 0x001b
194 #define EEPROM_NIC_CONF1_HW_RADIO FIELD16(0x0001)
195 @@ -2239,6 +2261,8 @@ struct mac_iveiv_entry {
196 #define EEPROM_NIC_CONF1_INTERNAL_TX_ALC FIELD16(0x2000)
197 #define EEPROM_NIC_CONF1_BT_COEXIST FIELD16(0x4000)
198 #define EEPROM_NIC_CONF1_DAC_TEST FIELD16(0x8000)
199 +#define EEPROM_NIC_CONF1_EXTERNAL_TX0_PA_3352 FIELD16(0x4000)
200 +#define EEPROM_NIC_CONF1_EXTERNAL_TX1_PA_3352 FIELD16(0x8000)
204 --- a/drivers/net/wireless/rt2x00/rt2x00.h
205 +++ b/drivers/net/wireless/rt2x00/rt2x00.h
206 @@ -740,6 +740,8 @@ enum rt2x00_capability_flags {
207 CAPABILITY_DOUBLE_ANTENNA,
208 CAPABILITY_BT_COEXIST,
209 CAPABILITY_VCO_RECALIBRATION,
210 + CAPABILITY_INTERNAL_PA_TX0,
211 + CAPABILITY_INTERNAL_PA_TX1,