AA: mac80211: backport package from trunk r39886
[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 616-rt2x00-support-rt5350.patch
1 --- a/drivers/net/wireless/rt2x00/rt2800.h
2 +++ b/drivers/net/wireless/rt2x00/rt2800.h
3 @@ -71,6 +71,7 @@
4 #define RF5592 0x000f
5 #define RF3070 0x3070
6 #define RF3290 0x3290
7 +#define RF5350 0x5350
8 #define RF5360 0x5360
9 #define RF5370 0x5370
10 #define RF5372 0x5372
11 --- a/drivers/net/wireless/rt2x00/rt2800lib.c
12 +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
13 @@ -2705,6 +2705,13 @@ static void rt2800_config_channel_rf53xx
14
15 rt2800_rfcsr_write(rt2x00dev, 59,
16 r59_non_bt[idx]);
17 + } else if (rt2x00_rt(rt2x00dev, RT5350)) {
18 + static const char r59_non_bt[] = {0x0b, 0x0b,
19 + 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0a,
20 + 0x0a, 0x09, 0x08, 0x07, 0x07, 0x06};
21 +
22 + rt2800_rfcsr_write(rt2x00dev, 59,
23 + r59_non_bt[idx]);
24 }
25 }
26 }
27 @@ -3142,6 +3149,7 @@ static void rt2800_config_channel(struct
28 rt2800_config_channel_rf3322(rt2x00dev, conf, rf, info);
29 break;
30 case RF3070:
31 + case RF5350:
32 case RF5360:
33 case RF5370:
34 case RF5372:
35 @@ -3159,6 +3167,7 @@ static void rt2800_config_channel(struct
36 if (rt2x00_rf(rt2x00dev, RF3070) ||
37 rt2x00_rf(rt2x00dev, RF3290) ||
38 rt2x00_rf(rt2x00dev, RF3322) ||
39 + rt2x00_rf(rt2x00dev, RF5350) ||
40 rt2x00_rf(rt2x00dev, RF5360) ||
41 rt2x00_rf(rt2x00dev, RF5370) ||
42 rt2x00_rf(rt2x00dev, RF5372) ||
43 @@ -3399,7 +3408,8 @@ static void rt2800_config_channel(struct
44 /*
45 * Clear update flag
46 */
47 - if (rt2x00_rt(rt2x00dev, RT3352)) {
48 + if (rt2x00_rt(rt2x00dev, RT3352) ||
49 + rt2x00_rt(rt2x00dev, RT5350)) {
50 rt2800_bbp_read(rt2x00dev, 49, &bbp);
51 rt2x00_set_field8(&bbp, BBP49_UPDATE_FLAG, 0);
52 rt2800_bbp_write(rt2x00dev, 49, bbp);
53 @@ -4273,6 +4283,7 @@ void rt2800_vco_calibration(struct rt2x0
54 case RF3053:
55 case RF3070:
56 case RF3290:
57 + case RF5350:
58 case RF5360:
59 case RF5370:
60 case RF5372:
61 @@ -4669,6 +4680,8 @@ static int rt2800_init_registers(struct
62 rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);
63 rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
64 rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000);
65 + } else if (rt2x00_rt(rt2x00dev, RT5350)) {
66 + rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);
67 } else {
68 rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000000);
69 rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
70 @@ -5310,9 +5323,13 @@ static void rt2800_init_bbp_3352(struct
71
72 rt2800_bbp_write(rt2x00dev, 82, 0x62);
73
74 - rt2800_bbp_write(rt2x00dev, 83, 0x6a);
75 -
76 - rt2800_bbp_write(rt2x00dev, 84, 0x99);
77 + if (rt2x00_rt(rt2x00dev, RT5350)) {
78 + rt2800_bbp_write(rt2x00dev, 83, 0x7a);
79 + rt2800_bbp_write(rt2x00dev, 84, 0x9a);
80 + } else {
81 + rt2800_bbp_write(rt2x00dev, 83, 0x6a);
82 + rt2800_bbp_write(rt2x00dev, 84, 0x99);
83 + }
84
85 rt2800_bbp_write(rt2x00dev, 86, 0x38);
86
87 @@ -5326,9 +5343,13 @@ static void rt2800_init_bbp_3352(struct
88
89 rt2800_bbp_write(rt2x00dev, 104, 0x92);
90
91 - rt2800_bbp_write(rt2x00dev, 105, 0x34);
92 -
93 - rt2800_bbp_write(rt2x00dev, 106, 0x05);
94 + if (rt2x00_rt(rt2x00dev, RT5350)) {
95 + rt2800_bbp_write(rt2x00dev, 105, 0x3c);
96 + rt2800_bbp_write(rt2x00dev, 106, 0x03);
97 + } else {
98 + rt2800_bbp_write(rt2x00dev, 105, 0x34);
99 + rt2800_bbp_write(rt2x00dev, 106, 0x05);
100 + }
101
102 rt2800_bbp_write(rt2x00dev, 120, 0x50);
103
104 @@ -5353,6 +5374,13 @@ static void rt2800_init_bbp_3352(struct
105 rt2800_bbp_write(rt2x00dev, 143, 0xa2);
106
107 rt2800_bbp_write(rt2x00dev, 148, 0xc8);
108 +
109 + if (rt2x00_rt(rt2x00dev, RT5350)) {
110 + rt2800_bbp_write(rt2x00dev, 150, 0x40); /* Antenna Software OFDM */
111 + rt2800_bbp_write(rt2x00dev, 151, 0x30); /* Antenna Software CCK */
112 + rt2800_bbp_write(rt2x00dev, 152, 0xa3);
113 + rt2800_bbp_write(rt2x00dev, 154, 0); /* Clear previously selected antenna */
114 + }
115 }
116
117 static void rt2800_init_bbp_3390(struct rt2x00_dev *rt2x00dev)
118 @@ -5653,6 +5681,7 @@ static void rt2800_init_bbp(struct rt2x0
119 rt2800_init_bbp_3290(rt2x00dev);
120 break;
121 case RT3352:
122 + case RT5350:
123 rt2800_init_bbp_3352(rt2x00dev);
124 break;
125 case RT3390:
126 @@ -6463,6 +6492,76 @@ static void rt2800_init_rfcsr_3593(struc
127 /* TODO: enable stream mode support */
128 }
129
130 +static void rt2800_init_rfcsr_5350(struct rt2x00_dev *rt2x00dev)
131 +{
132 + rt2800_rfcsr_write(rt2x00dev, 0, 0xf0);
133 + rt2800_rfcsr_write(rt2x00dev, 1, 0x23);
134 + rt2800_rfcsr_write(rt2x00dev, 2, 0x50);
135 + rt2800_rfcsr_write(rt2x00dev, 3, 0x08);
136 + rt2800_rfcsr_write(rt2x00dev, 4, 0x49);
137 + rt2800_rfcsr_write(rt2x00dev, 5, 0x10);
138 + rt2800_rfcsr_write(rt2x00dev, 6, 0xe0);
139 + rt2800_rfcsr_write(rt2x00dev, 7, 0x00);
140 + rt2800_rfcsr_write(rt2x00dev, 8, 0xf1);
141 + rt2800_rfcsr_write(rt2x00dev, 9, 0x02);
142 + rt2800_rfcsr_write(rt2x00dev, 10, 0x53);
143 + rt2800_rfcsr_write(rt2x00dev, 11, 0x4a);
144 + rt2800_rfcsr_write(rt2x00dev, 12, 0x46);
145 + if(rt2x00dev->spec.clk_is_20mhz)
146 + rt2800_rfcsr_write(rt2x00dev, 13, 0x1f);
147 + else
148 + rt2800_rfcsr_write(rt2x00dev, 13, 0x9f);
149 + rt2800_rfcsr_write(rt2x00dev, 14, 0x00);
150 + rt2800_rfcsr_write(rt2x00dev, 15, 0x00);
151 + rt2800_rfcsr_write(rt2x00dev, 16, 0xc0);
152 + rt2800_rfcsr_write(rt2x00dev, 18, 0x03);
153 + rt2800_rfcsr_write(rt2x00dev, 19, 0x00);
154 + rt2800_rfcsr_write(rt2x00dev, 20, 0x00);
155 + rt2800_rfcsr_write(rt2x00dev, 21, 0x00);
156 + rt2800_rfcsr_write(rt2x00dev, 22, 0x20);
157 + rt2800_rfcsr_write(rt2x00dev, 23, 0x00);
158 + rt2800_rfcsr_write(rt2x00dev, 24, 0x00);
159 + rt2800_rfcsr_write(rt2x00dev, 25, 0x80);
160 + rt2800_rfcsr_write(rt2x00dev, 26, 0x00);
161 + rt2800_rfcsr_write(rt2x00dev, 27, 0x03);
162 + rt2800_rfcsr_write(rt2x00dev, 28, 0x00);
163 + rt2800_rfcsr_write(rt2x00dev, 29, 0xd0);
164 + rt2800_rfcsr_write(rt2x00dev, 30, 0x10);
165 + rt2800_rfcsr_write(rt2x00dev, 31, 0x80);
166 + rt2800_rfcsr_write(rt2x00dev, 32, 0x80);
167 + rt2800_rfcsr_write(rt2x00dev, 33, 0x00);
168 + rt2800_rfcsr_write(rt2x00dev, 34, 0x07);
169 + rt2800_rfcsr_write(rt2x00dev, 35, 0x12);
170 + rt2800_rfcsr_write(rt2x00dev, 36, 0x00);
171 + rt2800_rfcsr_write(rt2x00dev, 37, 0x08);
172 + rt2800_rfcsr_write(rt2x00dev, 38, 0x85);
173 + rt2800_rfcsr_write(rt2x00dev, 39, 0x1b);
174 + rt2800_rfcsr_write(rt2x00dev, 40, 0x0b);
175 + rt2800_rfcsr_write(rt2x00dev, 41, 0xbb);
176 + rt2800_rfcsr_write(rt2x00dev, 42, 0xd5);
177 + rt2800_rfcsr_write(rt2x00dev, 43, 0x9b);
178 + rt2800_rfcsr_write(rt2x00dev, 44, 0x0c);
179 + rt2800_rfcsr_write(rt2x00dev, 45, 0xa6);
180 + rt2800_rfcsr_write(rt2x00dev, 46, 0x73);
181 + rt2800_rfcsr_write(rt2x00dev, 47, 0x00);
182 + rt2800_rfcsr_write(rt2x00dev, 48, 0x10);
183 + rt2800_rfcsr_write(rt2x00dev, 49, 0x80);
184 + rt2800_rfcsr_write(rt2x00dev, 50, 0x00);
185 + rt2800_rfcsr_write(rt2x00dev, 51, 0x00);
186 + rt2800_rfcsr_write(rt2x00dev, 52, 0x38);
187 + rt2800_rfcsr_write(rt2x00dev, 53, 0x00);
188 + rt2800_rfcsr_write(rt2x00dev, 54, 0x38);
189 + rt2800_rfcsr_write(rt2x00dev, 55, 0x43);
190 + rt2800_rfcsr_write(rt2x00dev, 56, 0x82);
191 + rt2800_rfcsr_write(rt2x00dev, 57, 0x00);
192 + rt2800_rfcsr_write(rt2x00dev, 58, 0x39);
193 + rt2800_rfcsr_write(rt2x00dev, 59, 0x0b);
194 + rt2800_rfcsr_write(rt2x00dev, 60, 0x45);
195 + rt2800_rfcsr_write(rt2x00dev, 61, 0xd1);
196 + rt2800_rfcsr_write(rt2x00dev, 62, 0x00);
197 + rt2800_rfcsr_write(rt2x00dev, 63, 0x00);
198 +}
199 +
200 static void rt2800_init_rfcsr_5390(struct rt2x00_dev *rt2x00dev)
201 {
202 rt2800_rf_init_calibration(rt2x00dev, 2);
203 @@ -6700,6 +6799,9 @@ static void rt2800_init_rfcsr(struct rt2
204 case RT3593:
205 rt2800_init_rfcsr_3593(rt2x00dev);
206 break;
207 + case RT5350:
208 + rt2800_init_rfcsr_5350(rt2x00dev);
209 + break;
210 case RT5390:
211 rt2800_init_rfcsr_5390(rt2x00dev);
212 break;
213 @@ -6949,6 +7051,12 @@ static int rt2800_validate_eeprom(struct
214 rt2x00_set_field16(&word, EEPROM_NIC_CONF0_RF_TYPE, RF2820);
215 rt2800_eeprom_write(rt2x00dev, EEPROM_NIC_CONF0, word);
216 rt2x00_eeprom_dbg(rt2x00dev, "Antenna: 0x%04x\n", word);
217 + } else if (rt2x00_rt(rt2x00dev, RT5350)) {
218 + rt2x00_set_field16(&word, EEPROM_NIC_CONF0_RXPATH, 1);
219 + rt2x00_set_field16(&word, EEPROM_NIC_CONF0_TXPATH, 1);
220 + rt2x00_set_field16(&word, EEPROM_NIC_CONF0_RF_TYPE, RF3320);
221 + rt2x00_eeprom_write(rt2x00dev, EEPROM_NIC_CONF0, word);
222 + rt2x00_eeprom_dbg(rt2x00dev, "Antenna: 0x%04x\n", word);
223 } else if (rt2x00_rt(rt2x00dev, RT2860) ||
224 rt2x00_rt(rt2x00dev, RT2872)) {
225 /*
226 @@ -7082,6 +7190,8 @@ static int rt2800_init_eeprom(struct rt2
227 rt2x00_rt(rt2x00dev, RT5390) ||
228 rt2x00_rt(rt2x00dev, RT5392))
229 rt2800_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf);
230 + else if (rt2x00_rt(rt2x00dev, RT5350))
231 + rf = RF5350;
232 else
233 rf = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RF_TYPE);
234
235 @@ -7100,6 +7210,7 @@ static int rt2800_init_eeprom(struct rt2
236 case RF3290:
237 case RF3320:
238 case RF3322:
239 + case RF5350:
240 case RF5360:
241 case RF5370:
242 case RF5372:
243 @@ -7595,6 +7706,7 @@ static int rt2800_probe_hw_mode(struct r
244 case RF3290:
245 case RF3320:
246 case RF3322:
247 + case RF5350:
248 case RF5360:
249 case RF5370:
250 case RF5372:
251 @@ -7727,6 +7839,7 @@ static int rt2800_probe_hw_mode(struct r
252 case RF3053:
253 case RF3070:
254 case RF3290:
255 + case RF5350:
256 case RF5360:
257 case RF5370:
258 case RF5372:
259 @@ -7765,6 +7878,7 @@ static int rt2800_probe_rt(struct rt2x00
260 case RT3390:
261 case RT3572:
262 case RT3593:
263 + case RT5350:
264 case RT5390:
265 case RT5392:
266 case RT5592:
267 --- a/drivers/net/wireless/rt2x00/rt2x00.h
268 +++ b/drivers/net/wireless/rt2x00/rt2x00.h
269 @@ -169,6 +169,7 @@ struct rt2x00_chip {
270 #define RT3572 0x3572
271 #define RT3593 0x3593
272 #define RT3883 0x3883 /* WSOC */
273 +#define RT5350 0x5350 /* WSOC 2.4GHz */
274 #define RT5390 0x5390 /* 2.4GHz */
275 #define RT5392 0x5392 /* 2.4GHz */
276 #define RT5592 0x5592