mac80211: update to wireless-testing 2017-01-31
[librecmc/librecmc.git] / package / kernel / mac80211 / patches / 621-rt2x00-add-support-for-mt7620.patch
1 --- a/drivers/net/wireless/ralink/rt2x00/rt2800.h
2 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800.h
3 @@ -81,6 +81,7 @@
4  #define RF5372                         0x5372
5  #define RF5390                         0x5390
6  #define RF5392                         0x5392
7 +#define RF7620                         0x7620
8  
9  /*
10   * Chipset revisions.
11 @@ -641,6 +642,14 @@
12  #define RF_CSR_CFG_BUSY                        FIELD32(0x00020000)
13  
14  /*
15 + * mt7620 RF registers (reversed order)
16 + */
17 +#define RF_CSR_CFG_DATA_MT7620         FIELD32(0x0000ff00)
18 +#define RF_CSR_CFG_REGNUM_MT7620       FIELD32(0x03ff0000)
19 +#define RF_CSR_CFG_WRITE_MT7620                FIELD32(0x00000010)
20 +#define RF_CSR_CFG_BUSY_MT7620         FIELD32(0x00000001)
21 +
22 +/*
23   * EFUSE_CSR: RT30x0 EEPROM
24   */
25  #define EFUSE_CTRL                     0x0580
26 @@ -1024,6 +1033,11 @@
27  #define AUTOWAKEUP_CFG_AUTOWAKE                FIELD32(0x00008000)
28  
29  /*
30 + * mt7620
31 + */
32 +#define MIMO_PS_CFG                    0x1210
33 +
34 +/*
35   * EDCA_AC0_CFG:
36   */
37  #define EDCA_AC0_CFG                   0x1300
38 @@ -1203,6 +1217,8 @@
39  #define TX_PIN_CFG_RFTR_POL            FIELD32(0x00020000)
40  #define TX_PIN_CFG_TRSW_EN             FIELD32(0x00040000)
41  #define TX_PIN_CFG_TRSW_POL            FIELD32(0x00080000)
42 +#define TX_PIN_CFG_RFRX_EN             FIELD32(0x00100000) /* mt7620 */
43 +#define TX_PIN_CFG_RFRX_POL            FIELD32(0x00200000) /* mt7620 */
44  #define TX_PIN_CFG_PA_PE_A2_EN         FIELD32(0x01000000)
45  #define TX_PIN_CFG_PA_PE_G2_EN         FIELD32(0x02000000)
46  #define TX_PIN_CFG_PA_PE_A2_POL                FIELD32(0x04000000)
47 @@ -1549,6 +1565,17 @@
48  #define TX_PWR_CFG_4_EXT_STBC4_CH2     FIELD32(0x0000000f)
49  #define TX_PWR_CFG_4_EXT_STBC6_CH2     FIELD32(0x00000f00)
50  
51 +/* mt7620 */
52 +#define TX0_RF_GAIN_CORRECT            0x13a0
53 +#define TX1_RF_GAIN_CORRECT            0x13a4
54 +#define TX0_RF_GAIN_ATTEN              0x13a8
55 +#define TX1_RF_GAIN_ATTEN              0x13ac
56 +#define TX_ALG_CFG_0                   0x13b0
57 +#define TX_ALG_CFG_1                   0x13b4
58 +#define TX0_BB_GAIN_ATTEN              0x13c0
59 +#define TX1_BB_GAIN_ATTEN              0x13c4
60 +#define TX_ALC_VGA3                    0x13c8
61 +
62  /* TX_PWR_CFG_7 */
63  #define TX_PWR_CFG_7                   0x13d4
64  #define TX_PWR_CFG_7_OFDM54_CH0                FIELD32(0x0000000f)
65 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
66 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
67 @@ -60,6 +60,8 @@
68         rt2800_regbusy_read((__dev), BBP_CSR_CFG, BBP_CSR_CFG_BUSY, (__reg))
69  #define WAIT_FOR_RFCSR(__dev, __reg) \
70         rt2800_regbusy_read((__dev), RF_CSR_CFG, RF_CSR_CFG_BUSY, (__reg))
71 +#define WAIT_FOR_RFCSR_MT7620(__dev, __reg) \
72 +       rt2800_regbusy_read((__dev), RF_CSR_CFG, RF_CSR_CFG_BUSY_MT7620, (__reg))
73  #define WAIT_FOR_RF(__dev, __reg) \
74         rt2800_regbusy_read((__dev), RF_CSR_CFG0, RF_CSR_CFG0_BUSY, (__reg))
75  #define WAIT_FOR_MCU(__dev, __reg) \
76 @@ -151,19 +153,55 @@ static void rt2800_rfcsr_write(struct rt
77          * Wait until the RFCSR becomes available, afterwards we
78          * can safely write the new data into the register.
79          */
80 -       if (WAIT_FOR_RFCSR(rt2x00dev, &reg)) {
81 -               reg = 0;
82 -               rt2x00_set_field32(&reg, RF_CSR_CFG_DATA, value);
83 -               rt2x00_set_field32(&reg, RF_CSR_CFG_REGNUM, word);
84 -               rt2x00_set_field32(&reg, RF_CSR_CFG_WRITE, 1);
85 -               rt2x00_set_field32(&reg, RF_CSR_CFG_BUSY, 1);
86 +       switch (rt2x00dev->chip.rf) {
87 +       case RF7620:
88 +               if (WAIT_FOR_RFCSR_MT7620(rt2x00dev, &reg)) {
89 +                       reg = 0;
90 +                       rt2x00_set_field32(&reg, RF_CSR_CFG_DATA_MT7620, value);
91 +                       rt2x00_set_field32(&reg, RF_CSR_CFG_REGNUM_MT7620, word);
92 +                       rt2x00_set_field32(&reg, RF_CSR_CFG_WRITE_MT7620, 1);
93 +                       rt2x00_set_field32(&reg, RF_CSR_CFG_BUSY_MT7620, 1);
94  
95 -               rt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg);
96 +                       rt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg);
97 +               }
98 +               break;
99 +
100 +       default:
101 +               if (WAIT_FOR_RFCSR(rt2x00dev, &reg)) {
102 +                       reg = 0;
103 +                       rt2x00_set_field32(&reg, RF_CSR_CFG_DATA, value);
104 +                       rt2x00_set_field32(&reg, RF_CSR_CFG_REGNUM, word);
105 +                       rt2x00_set_field32(&reg, RF_CSR_CFG_WRITE, 1);
106 +                       rt2x00_set_field32(&reg, RF_CSR_CFG_BUSY, 1);
107 +
108 +                       rt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg);
109 +               }
110 +               break;
111         }
112  
113         mutex_unlock(&rt2x00dev->csr_mutex);
114  }
115  
116 +static void rt2800_rfcsr_write_bank(struct rt2x00_dev *rt2x00dev, const u8 bank,
117 +                                   const unsigned int reg, const u8 value)
118 +{
119 +       rt2800_rfcsr_write(rt2x00dev, (reg | (bank << 6)), value);
120 +}
121 +
122 +static void rt2800_rfcsr_write_chanreg(struct rt2x00_dev *rt2x00dev,
123 +                                      const unsigned int reg, const u8 value)
124 +{
125 +       rt2800_rfcsr_write_bank(rt2x00dev, 4, reg, value);
126 +       rt2800_rfcsr_write_bank(rt2x00dev, 6, reg, value);
127 +}
128 +
129 +static void rt2800_rfcsr_write_dccal(struct rt2x00_dev *rt2x00dev,
130 +                                    const unsigned int reg, const u8 value)
131 +{
132 +       rt2800_rfcsr_write_bank(rt2x00dev, 5, reg, value);
133 +       rt2800_rfcsr_write_bank(rt2x00dev, 7, reg, value);
134 +}
135 +
136  static void rt2800_rfcsr_read(struct rt2x00_dev *rt2x00dev,
137                               const unsigned int word, u8 *value)
138  {
139 @@ -179,22 +217,47 @@ static void rt2800_rfcsr_read(struct rt2
140          * doesn't become available in time, reg will be 0xffffffff
141          * which means we return 0xff to the caller.
142          */
143 -       if (WAIT_FOR_RFCSR(rt2x00dev, &reg)) {
144 -               reg = 0;
145 -               rt2x00_set_field32(&reg, RF_CSR_CFG_REGNUM, word);
146 -               rt2x00_set_field32(&reg, RF_CSR_CFG_WRITE, 0);
147 -               rt2x00_set_field32(&reg, RF_CSR_CFG_BUSY, 1);
148 +       switch (rt2x00dev->chip.rf) {
149 +       case RF7620:
150 +               if (WAIT_FOR_RFCSR_MT7620(rt2x00dev, &reg)) {
151 +                       reg = 0;
152 +                       rt2x00_set_field32(&reg, RF_CSR_CFG_REGNUM_MT7620, word);
153 +                       rt2x00_set_field32(&reg, RF_CSR_CFG_WRITE_MT7620, 0);
154 +                       rt2x00_set_field32(&reg, RF_CSR_CFG_BUSY_MT7620, 1);
155  
156 -               rt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg);
157 +                       rt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg);
158  
159 -               WAIT_FOR_RFCSR(rt2x00dev, &reg);
160 -       }
161 +                       WAIT_FOR_RFCSR_MT7620(rt2x00dev, &reg);
162 +               }
163  
164 -       *value = rt2x00_get_field32(reg, RF_CSR_CFG_DATA);
165 +               *value = rt2x00_get_field32(reg, RF_CSR_CFG_DATA_MT7620);
166 +               break;
167 +
168 +       default:
169 +               if (WAIT_FOR_RFCSR(rt2x00dev, &reg)) {
170 +                       reg = 0;
171 +                       rt2x00_set_field32(&reg, RF_CSR_CFG_REGNUM, word);
172 +                       rt2x00_set_field32(&reg, RF_CSR_CFG_WRITE, 0);
173 +                       rt2x00_set_field32(&reg, RF_CSR_CFG_BUSY, 1);
174 +
175 +                       rt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg);
176 +
177 +                       WAIT_FOR_RFCSR(rt2x00dev, &reg);
178 +               }
179 +
180 +               *value = rt2x00_get_field32(reg, RF_CSR_CFG_DATA);
181 +               break;
182 +       }
183  
184         mutex_unlock(&rt2x00dev->csr_mutex);
185  }
186  
187 +static void rt2800_rfcsr_read_bank(struct rt2x00_dev *rt2x00dev, const u8 bank,
188 +                                  const unsigned int reg, u8 *value)
189 +{
190 +       rt2800_rfcsr_read(rt2x00dev, (reg | (bank << 6)), value);
191 +}
192 +
193  static void rt2800_rf_write(struct rt2x00_dev *rt2x00dev,
194                             const unsigned int word, const u32 value)
195  {
196 @@ -526,6 +589,16 @@ void rt2800_get_txwi_rxwi_size(struct rt
197                 *rxwi_size = RXWI_DESC_SIZE_5WORDS;
198                 break;
199  
200 +       case RT5390:
201 +               if ( rt2x00dev->chip.rf == RF7620 ) {
202 +                       *txwi_size = TXWI_DESC_SIZE_5WORDS;
203 +                       *rxwi_size = RXWI_DESC_SIZE_6WORDS;
204 +               } else {
205 +                       *txwi_size = TXWI_DESC_SIZE_4WORDS;
206 +                       *rxwi_size = RXWI_DESC_SIZE_4WORDS;
207 +               }
208 +               break;
209 +
210         case RT5592:
211                 *txwi_size = TXWI_DESC_SIZE_5WORDS;
212                 *rxwi_size = RXWI_DESC_SIZE_6WORDS;
213 @@ -3258,6 +3331,317 @@ static void rt2800_config_channel_rf55xx
214         rt2800_bbp_write(rt2x00dev, 196, (rf->channel <= 14) ? 0x19 : 0x7F);
215  }
216  
217 +typedef struct mt7620_freqconfig {
218 +       u8      Channel;
219 +       u8      Rdiv;
220 +       u16     N;
221 +       u8      K;
222 +       u8      D;
223 +       u32     Ksd;
224 +} mt7620_freqconfig;
225 +
226 +mt7620_freqconfig mt7620_chanconfig[] =
227 +{
228 +       /* 2.4 to 2.483 GHz
229 +        * CH   Rdiv    N       K       D       Ksd */
230 +       { 0,    0,      0,      0,      0,      0       },
231 +       { 1,    3,      0x50,   0,      0,      0x19999 },
232 +       { 2,    3,      0x50,   0,      0,      0x24444 },
233 +       { 3,    3,      0x50,   0,      0,      0x2EEEE },
234 +       { 4,    3,      0x50,   0,      0,      0x39999 },
235 +       { 5,    3,      0x51,   0,      0,      0x04444 },
236 +       { 6,    3,      0x51,   0,      0,      0x0EEEE },
237 +       { 7,    3,      0x51,   0,      0,      0x19999 },
238 +       { 8,    3,      0x51,   0,      0,      0x24444 },
239 +       { 9,    3,      0x51,   0,      0,      0x2EEEE },
240 +       { 10,   3,      0x51,   0,      0,      0x39999 },
241 +       { 11,   3,      0x52,   0,      0,      0x04444 },
242 +       { 12,   3,      0x52,   0,      0,      0x0EEEE },
243 +       { 13,   3,      0x52,   0,      0,      0x19999 },
244 +       { 14,   3,      0x52,   0,      0,      0x33333 },
245 +};
246 +
247 +static void rt2800_config_channel_rf7620(struct rt2x00_dev *rt2x00dev,
248 +                                        struct ieee80211_conf *conf,
249 +                                        struct rf_channel *rf,
250 +                                        struct channel_info *info)
251 +{
252 +       struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
253 +       u32 mac_sys_ctrl, mac_status;
254 +       u16 eeprom, target_power;
255 +       u32 tx_pin = 0x00150F0F;
256 +       u8 txrx_agc_fc;
257 +       u8 rfcsr;
258 +       u32 reg;
259 +       u8 bbp;
260 +       int i;
261 +
262 +       /* Frequeny plan setting */
263 +       /*      
264 +         * Rdiv setting
265 +         * R13[1:0] 
266 +         */
267 +       rt2800_rfcsr_read(rt2x00dev, 13, &rfcsr);
268 +       rfcsr = rfcsr & (~0x03);
269 +       if (rt2800_clk_is_20mhz(rt2x00dev))
270 +               rfcsr |= (mt7620_chanconfig[rf->channel].Rdiv & 0x3);
271 +       rt2800_rfcsr_write(rt2x00dev, 13, rfcsr);
272 +
273 +       /*  
274 +        * N setting
275 +        * R21[0], R20[7:0] 
276 +        */
277 +       rt2800_rfcsr_read(rt2x00dev, 20, &rfcsr);
278 +       rfcsr = (mt7620_chanconfig[rf->channel].N & 0x00ff);
279 +       rt2800_rfcsr_write(rt2x00dev, 20, rfcsr);
280 +
281 +       rt2800_rfcsr_read(rt2x00dev, 21, &rfcsr);
282 +       rfcsr = rfcsr & (~0x01);
283 +       rfcsr |= ((mt7620_chanconfig[rf->channel].N & 0x0100) >> 8);
284 +       rt2800_rfcsr_write(rt2x00dev, 21, rfcsr);
285 +
286 +       /* 
287 +        * K setting 
288 +        * R16[3:0] (RF PLL freq selection)
289 +        */
290 +       rt2800_rfcsr_read(rt2x00dev, 16, &rfcsr);
291 +       rfcsr = rfcsr & (~0x0f);
292 +       rfcsr |= (mt7620_chanconfig[rf->channel].K & 0x0f);
293 +       rt2800_rfcsr_write(rt2x00dev, 16, rfcsr);
294 +
295 +       /* 
296 +        * D setting 
297 +        * R22[2:0] (D=15, R22[2:0]=<111>)
298 +        */
299 +       rt2800_rfcsr_read(rt2x00dev, 22, &rfcsr);
300 +       rfcsr = rfcsr & (~0x07);
301 +       rfcsr |= (mt7620_chanconfig[rf->channel].D & 0x07);
302 +       rt2800_rfcsr_write(rt2x00dev, 22, rfcsr);
303 +
304 +       /*      
305 +        * Ksd setting
306 +        * Ksd: R19<1:0>,R18<7:0>,R17<7:0>
307 +        */
308 +       rt2800_rfcsr_read(rt2x00dev, 17, &rfcsr);
309 +       rfcsr = (mt7620_chanconfig[rf->channel].Ksd & 0x000000ff);
310 +       rt2800_rfcsr_write(rt2x00dev, 17, rfcsr);
311 +
312 +       rt2800_rfcsr_read(rt2x00dev, 18, &rfcsr);
313 +       rfcsr = ((mt7620_chanconfig[rf->channel].Ksd & 0x0000ff00) >> 8);
314 +       rt2800_rfcsr_write(rt2x00dev, 18, rfcsr);
315 +
316 +       rt2800_rfcsr_read(rt2x00dev, 19, &rfcsr);
317 +       rfcsr = rfcsr & (~0x03);
318 +       rfcsr |= ((mt7620_chanconfig[rf->channel].Ksd & 0x00030000) >> 16);
319 +       rt2800_rfcsr_write(rt2x00dev, 19, rfcsr);
320 +
321 +       /* Default: XO=20MHz , SDM mode */
322 +       rt2800_rfcsr_read(rt2x00dev, 16, &rfcsr);
323 +       rfcsr = rfcsr & (~0xE0);
324 +       rfcsr |= 0x80;
325 +       rt2800_rfcsr_write(rt2x00dev, 16, rfcsr);
326 +
327 +       rt2800_rfcsr_read(rt2x00dev, 21, &rfcsr);
328 +       rfcsr |= 0x80;
329 +       rt2800_rfcsr_write(rt2x00dev, 21, rfcsr);
330 +
331 +       rt2800_rfcsr_read(rt2x00dev, 1, &rfcsr);
332 +       if (rt2x00dev->default_ant.tx_chain_num == 1)
333 +               rfcsr &= (~0x2);
334 +       else
335 +               rfcsr |= 0x2;
336 +       rt2800_rfcsr_write(rt2x00dev, 1, rfcsr);
337 +
338 +       rt2800_rfcsr_read(rt2x00dev, 2, &rfcsr);
339 +       if (rt2x00dev->default_ant.tx_chain_num == 1)
340 +               rfcsr &= (~0x20);
341 +       else
342 +               rfcsr |= 0x20;
343 +       if (rt2x00dev->default_ant.rx_chain_num == 1)
344 +               rfcsr &= (~0x02);
345 +       else
346 +               rfcsr |= 0x02;
347 +       rt2800_rfcsr_write(rt2x00dev, 2, rfcsr);
348 +
349 +       rt2800_rfcsr_read(rt2x00dev, 42, &rfcsr);
350 +       if (rt2x00dev->default_ant.tx_chain_num == 1)
351 +               rfcsr &= (~0x40);
352 +       else
353 +               rfcsr |= 0x40;
354 +       rt2800_rfcsr_write(rt2x00dev, 42, rfcsr);
355 +
356 +       /* RF for DC Cal BW */
357 +       if (conf_is_ht40(conf)) {
358 +               rt2800_rfcsr_write_dccal(rt2x00dev, 6, 0x10);
359 +               rt2800_rfcsr_write_dccal(rt2x00dev, 7, 0x10);
360 +               rt2800_rfcsr_write_dccal(rt2x00dev, 8, 0x04);
361 +               rt2800_rfcsr_write_dccal(rt2x00dev, 58, 0x10);
362 +               rt2800_rfcsr_write_dccal(rt2x00dev, 59, 0x10);
363 +       } else {
364 +               rt2800_rfcsr_write_dccal(rt2x00dev, 6, 0x20);
365 +               rt2800_rfcsr_write_dccal(rt2x00dev, 7, 0x20);
366 +               rt2800_rfcsr_write_dccal(rt2x00dev, 8, 0x00);
367 +               rt2800_rfcsr_write_dccal(rt2x00dev, 58, 0x20);
368 +               rt2800_rfcsr_write_dccal(rt2x00dev, 59, 0x20);
369 +       }
370 +
371 +       if (conf_is_ht40(conf)) {
372 +               rt2800_rfcsr_write_dccal(rt2x00dev, 58, 0x08);
373 +               rt2800_rfcsr_write_dccal(rt2x00dev, 59, 0x08);
374 +       } else {
375 +               rt2800_rfcsr_write_dccal(rt2x00dev, 58, 0x28);
376 +               rt2800_rfcsr_write_dccal(rt2x00dev, 59, 0x28);
377 +       }
378 +
379 +       rt2800_rfcsr_read(rt2x00dev, 28, &rfcsr);
380 +       if (conf_is_ht40(conf) && (rf->channel == 11))
381 +               rfcsr |= 0x4;
382 +       else
383 +               rfcsr &= (~0x4);
384 +       rt2800_rfcsr_write(rt2x00dev, 28, rfcsr);
385 +
386 +       /*if (bScan == FALSE)*/
387 +       if (conf_is_ht40(conf)) {
388 +               txrx_agc_fc = rt2x00_get_field8(drv_data->calibration_bw40,
389 +                                               RFCSR24_TX_AGC_FC);
390 +       } else {
391 +               txrx_agc_fc = rt2x00_get_field8(drv_data->calibration_bw20,
392 +                                               RFCSR24_TX_AGC_FC);             
393 +       }
394 +       rt2800_rfcsr_read_bank(rt2x00dev, 5, 6, &rfcsr);
395 +       rfcsr &= (~0x3F);
396 +       rfcsr |= txrx_agc_fc;
397 +       rt2800_rfcsr_write_bank(rt2x00dev, 5, 6, rfcsr);
398 +       rt2800_rfcsr_read_bank(rt2x00dev, 5, 7, &rfcsr);
399 +       rfcsr &= (~0x3F);
400 +       rfcsr |= txrx_agc_fc;
401 +       rt2800_rfcsr_write_bank(rt2x00dev, 5, 7, rfcsr);
402 +       rt2800_rfcsr_read_bank(rt2x00dev, 7, 6, &rfcsr);
403 +       rfcsr &= (~0x3F);
404 +       rfcsr |= txrx_agc_fc;
405 +       rt2800_rfcsr_write_bank(rt2x00dev, 7, 6, rfcsr);
406 +       rt2800_rfcsr_read_bank(rt2x00dev, 7, 7, &rfcsr);
407 +       rfcsr &= (~0x3F);
408 +       rfcsr |= txrx_agc_fc;
409 +       rt2800_rfcsr_write_bank(rt2x00dev, 7, 7, rfcsr);
410 +
411 +       rt2800_rfcsr_read_bank(rt2x00dev, 5, 58, &rfcsr);
412 +       rfcsr &= (~0x3F);
413 +       rfcsr |= txrx_agc_fc;
414 +       rt2800_rfcsr_write_bank(rt2x00dev, 5, 58, rfcsr);
415 +       rt2800_rfcsr_read_bank(rt2x00dev, 5, 59, &rfcsr);
416 +       rfcsr &= (~0x3F);
417 +       rfcsr |= txrx_agc_fc;
418 +       rt2800_rfcsr_write_bank(rt2x00dev, 5, 59, rfcsr);
419 +       rt2800_rfcsr_read_bank(rt2x00dev, 7, 58, &rfcsr);
420 +       rfcsr &= (~0x3F);
421 +       rfcsr |= txrx_agc_fc;
422 +       rt2800_rfcsr_write_bank(rt2x00dev, 7, 58, rfcsr);
423 +       rt2800_rfcsr_read_bank(rt2x00dev, 7, 59, &rfcsr);
424 +       rfcsr &= (~0x3F);
425 +       rfcsr |= txrx_agc_fc;
426 +       rt2800_rfcsr_write_bank(rt2x00dev, 7, 59, rfcsr);
427 +
428 +       rt2800_register_read(rt2x00dev, TX_ALG_CFG_0, &reg);
429 +       reg = reg & (~0x3F3F);
430 +       reg |= info->default_power1;
431 +       reg |= (info->default_power2 << 8);
432 +       reg |= (0x2F << 16);
433 +       reg |= (0x2F << 24);
434 +
435 +       rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);
436 +       if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF1_INTERNAL_TX_ALC)) {
437 +               /* init base power by e2p target power */
438 +               rt2800_eeprom_read(rt2x00dev, 0xD0, &target_power);
439 +               target_power &= 0x3F;
440 +               reg = reg & (~0x3F3F);
441 +               reg |= target_power;
442 +               reg |= (target_power << 8);
443 +       }
444 +       rt2800_register_write(rt2x00dev, TX_ALG_CFG_0, reg);
445 +
446 +       rt2800_register_read(rt2x00dev, TX_ALG_CFG_1, &reg);
447 +       reg = reg & (~0x3F);
448 +       rt2800_register_write(rt2x00dev, TX_ALG_CFG_1, reg);
449 +
450 +       /*if (bScan == FALSE)*/
451 +       /* Save MAC SYS CTRL registers */
452 +       rt2800_register_read(rt2x00dev, MAC_SYS_CTRL, &mac_sys_ctrl);
453 +       /* Disable Tx/Rx */
454 +       rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, 0);
455 +       /* Check MAC Tx/Rx idle */
456 +       for (i = 0; i < 10000; i++) {
457 +               rt2800_register_read(rt2x00dev, MAC_STATUS_CFG, &mac_status);
458 +               if (mac_status & 0x3)
459 +                       udelay(50);
460 +               else
461 +                       break;
462 +       }
463 +
464 +       if (i == 10000)
465 +               rt2x00_warn(rt2x00dev, "Wait MAC Status to MAX !!!\n");
466 +
467 +       if (rf->channel > 10) {
468 +               rt2800_bbp_read(rt2x00dev, 30, &bbp);
469 +               bbp = 0x40;
470 +               rt2800_bbp_write(rt2x00dev, 30, bbp);
471 +               rt2800_rfcsr_write(rt2x00dev, 39, 0);
472 +               if (rt2x00_has_cap_external_lna_bg(rt2x00dev))
473 +                       rt2800_rfcsr_write(rt2x00dev, 42, 0xfb);
474 +               else
475 +                       rt2800_rfcsr_write(rt2x00dev, 42, 0x7b);
476 +       } else {
477 +               rt2800_bbp_read(rt2x00dev, 30, &bbp);
478 +               bbp = 0x1f;
479 +               rt2800_bbp_write(rt2x00dev, 30, bbp);
480 +               rt2800_rfcsr_write(rt2x00dev, 39, 0x80);
481 +               if (rt2x00_has_cap_external_lna_bg(rt2x00dev))
482 +                       rt2800_rfcsr_write(rt2x00dev, 42, 0xdb);
483 +               else
484 +                       rt2800_rfcsr_write(rt2x00dev, 42, 0x5b);
485 +       }
486 +
487 +       rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, mac_sys_ctrl);
488 +
489 +       rt2800_rfcsr_write(rt2x00dev, 5, 0x40);
490 +       rt2800_rfcsr_write(rt2x00dev, 4, 0x0C);
491 +
492 +       /* vcocal_en (initiate VCO calibration (reset after completion)) */
493 +       rt2800_rfcsr_read(rt2x00dev, 4, &rfcsr);
494 +       rfcsr = ((rfcsr & ~0x80) | 0x80);
495 +       rt2800_rfcsr_write(rt2x00dev, 4, rfcsr);
496 +       mdelay(2);
497 +
498 +       rt2800_register_write(rt2x00dev, TX_PIN_CFG, tx_pin);
499 +
500 +       if (rt2x00dev->default_ant.tx_chain_num == 1) {
501 +               rt2800_bbp_write(rt2x00dev, 91, 0x07);
502 +               rt2800_bbp_write(rt2x00dev, 95, 0x1A);
503 +               rt2800_bbp_write(rt2x00dev, 195, 128);
504 +               rt2800_bbp_write(rt2x00dev, 196, 0xA0);
505 +               rt2800_bbp_write(rt2x00dev, 195, 170);
506 +               rt2800_bbp_write(rt2x00dev, 196, 0x12);
507 +               rt2800_bbp_write(rt2x00dev, 195, 171);
508 +               rt2800_bbp_write(rt2x00dev, 196, 0x10);         
509 +       } else {
510 +               rt2800_bbp_write(rt2x00dev, 91, 0x06);
511 +               rt2800_bbp_write(rt2x00dev, 95, 0x9A);
512 +               rt2800_bbp_write(rt2x00dev, 195, 128);
513 +               rt2800_bbp_write(rt2x00dev, 196, 0xE0);
514 +               rt2800_bbp_write(rt2x00dev, 195, 170);
515 +               rt2800_bbp_write(rt2x00dev, 196, 0x30);
516 +               rt2800_bbp_write(rt2x00dev, 195, 171);
517 +               rt2800_bbp_write(rt2x00dev, 196, 0x30);
518 +       }
519 +
520 +       /* On 11A, We should delay and wait RF/BBP to be stable*/
521 +       /* and the appropriate time should be 1000 micro seconds */
522 +       /* 2005/06/05 - On 11G, We also need this delay time.
523 +        * Otherwise it's difficult to pass the WHQL.*/
524 +       udelay(1000);
525 +}
526 +
527 +
528  static void rt2800_bbp_write_with_rx_chain(struct rt2x00_dev *rt2x00dev,
529                                            const unsigned int word,
530                                            const u8 value)
531 @@ -3414,7 +3798,7 @@ static void rt2800_config_channel(struct
532                                   struct channel_info *info)
533  {
534         u32 reg;
535 -       unsigned int tx_pin;
536 +       u32 tx_pin;
537         u8 bbp, rfcsr;
538  
539         info->default_power1 = rt2800_txpower_to_dev(rt2x00dev, rf->channel,
540 @@ -3468,6 +3852,9 @@ static void rt2800_config_channel(struct
541         case RF5592:
542                 rt2800_config_channel_rf55xx(rt2x00dev, conf, rf, info);
543                 break;
544 +       case RF7620:
545 +               rt2800_config_channel_rf7620(rt2x00dev, conf, rf, info);
546 +               break;
547         default:
548                 rt2800_config_channel_rf2xxx(rt2x00dev, conf, rf, info);
549         }
550 @@ -3574,7 +3961,7 @@ static void rt2800_config_channel(struct
551                 else if (rt2x00_rt(rt2x00dev, RT3593) ||
552                          rt2x00_rt(rt2x00dev, RT3883))
553                         rt2800_bbp_write(rt2x00dev, 82, 0x82);
554 -               else
555 +               else if (rt2x00dev->chip.rf != RF7620)
556                         rt2800_bbp_write(rt2x00dev, 82, 0xf2);
557  
558                 if (rt2x00_rt(rt2x00dev, RT3593) ||
559 @@ -3596,7 +3983,7 @@ static void rt2800_config_channel(struct
560         if (rt2x00_rt(rt2x00dev, RT3572))
561                 rt2800_rfcsr_write(rt2x00dev, 8, 0);
562  
563 -       tx_pin = 0;
564 +       rt2800_register_read(rt2x00dev, TX_PIN_CFG, &tx_pin);
565  
566         switch (rt2x00dev->default_ant.tx_chain_num) {
567         case 3:
568 @@ -3645,6 +4032,7 @@ static void rt2800_config_channel(struct
569  
570         rt2x00_set_field32(&tx_pin, TX_PIN_CFG_RFTR_EN, 1);
571         rt2x00_set_field32(&tx_pin, TX_PIN_CFG_TRSW_EN, 1);
572 +       rt2x00_set_field32(&tx_pin, TX_PIN_CFG_RFRX_EN, 1); /* mt7620 */
573  
574         rt2800_register_write(rt2x00dev, TX_PIN_CFG, tx_pin);
575  
576 @@ -4662,6 +5050,14 @@ void rt2800_vco_calibration(struct rt2x0
577                 rt2x00_set_field8(&rfcsr, RFCSR3_VCOCAL_EN, 1);
578                 rt2800_rfcsr_write(rt2x00dev, 3, rfcsr);
579                 break;
580 +       case RF7620:
581 +               rt2800_rfcsr_read(rt2x00dev, 4, &rfcsr);
582 +               /* vcocal_en (initiate VCO calibration (reset after completion))
583 +                * It should be at the end of RF configuration. */
584 +               rfcsr = ((rfcsr & ~0x80) | 0x80); 
585 +               rt2800_rfcsr_write(rt2x00dev, 4, rfcsr);
586 +               mdelay(1);
587 +               break;
588         default:
589                 WARN_ONCE(1, "Not supported RF chipet %x for VCO recalibration",
590                           rt2x00dev->chip.rf);
591 @@ -5037,6 +5433,24 @@ static int rt2800_init_registers(struct
592                 rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00040000);
593                 rt2800_register_write(rt2x00dev, TX_TXBF_CFG_0, 0x8000fc21);
594                 rt2800_register_write(rt2x00dev, TX_TXBF_CFG_3, 0x00009c40);
595 +       } else if (rt2x00_rf(rt2x00dev, RF7620)) {
596 +               rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000401);
597 +               rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x000C0000);
598 +               rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000);
599 +               rt2800_register_write(rt2x00dev, MIMO_PS_CFG, 0x00000002);
600 +               rt2800_register_write(rt2x00dev, TX_PIN_CFG, 0x00150F0F);
601 +               rt2800_register_write(rt2x00dev, TX_ALC_VGA3, 0x06060606);
602 +               rt2800_register_write(rt2x00dev, TX0_BB_GAIN_ATTEN, 0x0);
603 +               rt2800_register_write(rt2x00dev, TX1_BB_GAIN_ATTEN, 0x0);
604 +               rt2800_register_write(rt2x00dev, TX0_RF_GAIN_ATTEN, 0x6C6C666C);
605 +               rt2800_register_write(rt2x00dev, TX1_RF_GAIN_ATTEN, 0x6C6C666C);
606 +               rt2800_register_write(rt2x00dev, TX0_RF_GAIN_CORRECT,
607 +                                     0x3630363A);
608 +               rt2800_register_write(rt2x00dev, TX1_RF_GAIN_CORRECT,
609 +                                     0x3630363A);
610 +               rt2800_register_read(rt2x00dev, TX_ALG_CFG_1, &reg);
611 +               reg = reg & (~0x80000000);
612 +               rt2800_register_write(rt2x00dev, TX_ALG_CFG_1, reg);
613         } else if (rt2x00_rt(rt2x00dev, RT5390) ||
614                    rt2x00_rt(rt2x00dev, RT5392)) {
615                 rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);
616 @@ -6075,6 +6489,225 @@ static void rt2800_init_bbp_5592(struct
617                 rt2800_bbp_write(rt2x00dev, 103, 0xc0);
618  }
619  
620 +static void rt2800_bbp_glrt_write(struct rt2x00_dev *rt2x00dev,
621 +                                 const u8 reg, const u8 value)
622 +{
623 +       rt2800_bbp_write(rt2x00dev, 195, reg);
624 +       rt2800_bbp_write(rt2x00dev, 196, value);
625 +}
626 +
627 +static void rt2800_bbp_dcoc_write(struct rt2x00_dev *rt2x00dev,
628 +                                 const u8 reg, const u8 value)
629 +{
630 +       rt2800_bbp_write(rt2x00dev, 158, reg);
631 +       rt2800_bbp_write(rt2x00dev, 159, value);
632 +}
633 +
634 +static void rt2800_init_bbp_7620(struct rt2x00_dev *rt2x00dev)
635 +{
636 +       u8 bbp;
637 +
638 +       /* Apply Maximum Likelihood Detection (MLD) for 2 stream case */
639 +       rt2800_bbp_read(rt2x00dev, 105, &bbp);
640 +       rt2x00_set_field8(&bbp, BBP105_MLD,
641 +                         rt2x00dev->default_ant.rx_chain_num == 2);
642 +       rt2800_bbp_write(rt2x00dev, 105, bbp);
643 +
644 +       /* Avoid data loss and CRC errors */
645 +       /* MAC interface control (MAC_IF_80M, 1: 80 MHz) */
646 +       rt2800_bbp4_mac_if_ctrl(rt2x00dev);
647 +
648 +       /* Fix I/Q swap issue */
649 +       rt2800_bbp_read(rt2x00dev, 1, &bbp);
650 +       bbp |= 0x04;
651 +       rt2800_bbp_write(rt2x00dev, 1, bbp);
652 +
653 +       /* BBP for G band */
654 +       rt2800_bbp_write(rt2x00dev, 3, 0x08);
655 +       rt2800_bbp_write(rt2x00dev, 4, 0x00); /* rt2800_bbp4_mac_if_ctrl? */
656 +       rt2800_bbp_write(rt2x00dev, 6, 0x08);
657 +       rt2800_bbp_write(rt2x00dev, 14, 0x09);
658 +       rt2800_bbp_write(rt2x00dev, 15, 0xFF);
659 +       rt2800_bbp_write(rt2x00dev, 16, 0x01);
660 +       rt2800_bbp_write(rt2x00dev, 20, 0x06);
661 +       rt2800_bbp_write(rt2x00dev, 21, 0x00);
662 +       rt2800_bbp_write(rt2x00dev, 22, 0x00);
663 +       rt2800_bbp_write(rt2x00dev, 27, 0x00);
664 +       rt2800_bbp_write(rt2x00dev, 28, 0x00);
665 +       rt2800_bbp_write(rt2x00dev, 30, 0x00);
666 +       rt2800_bbp_write(rt2x00dev, 31, 0x48);
667 +       rt2800_bbp_write(rt2x00dev, 47, 0x40);
668 +       rt2800_bbp_write(rt2x00dev, 62, 0x00);
669 +       rt2800_bbp_write(rt2x00dev, 63, 0x00);
670 +       rt2800_bbp_write(rt2x00dev, 64, 0x00);
671 +       rt2800_bbp_write(rt2x00dev, 65, 0x2C);
672 +       rt2800_bbp_write(rt2x00dev, 66, 0x1C);
673 +       rt2800_bbp_write(rt2x00dev, 67, 0x20);
674 +       rt2800_bbp_write(rt2x00dev, 68, 0xDD);
675 +       rt2800_bbp_write(rt2x00dev, 69, 0x10);
676 +       rt2800_bbp_write(rt2x00dev, 70, 0x05);
677 +       rt2800_bbp_write(rt2x00dev, 73, 0x18);
678 +       rt2800_bbp_write(rt2x00dev, 74, 0x0F);
679 +       rt2800_bbp_write(rt2x00dev, 75, 0x60);
680 +       rt2800_bbp_write(rt2x00dev, 76, 0x44);
681 +       rt2800_bbp_write(rt2x00dev, 77, 0x59);
682 +       rt2800_bbp_write(rt2x00dev, 78, 0x1E);
683 +       rt2800_bbp_write(rt2x00dev, 79, 0x1C);
684 +       rt2800_bbp_write(rt2x00dev, 80, 0x0C);
685 +       rt2800_bbp_write(rt2x00dev, 81, 0x3A);
686 +       rt2800_bbp_write(rt2x00dev, 82, 0xB6);
687 +       rt2800_bbp_write(rt2x00dev, 83, 0x9A);
688 +       rt2800_bbp_write(rt2x00dev, 84, 0x9A);
689 +       rt2800_bbp_write(rt2x00dev, 86, 0x38);
690 +       rt2800_bbp_write(rt2x00dev, 88, 0x90);
691 +       rt2800_bbp_write(rt2x00dev, 91, 0x04);
692 +       rt2800_bbp_write(rt2x00dev, 92, 0x02);
693 +       rt2800_bbp_write(rt2x00dev, 95, 0x9A);
694 +       rt2800_bbp_write(rt2x00dev, 96, 0x00);
695 +       rt2800_bbp_write(rt2x00dev, 103, 0xC0);
696 +       rt2800_bbp_write(rt2x00dev, 104, 0x92);
697 +       /* FIXME BBP105 owerwrite */
698 +       rt2800_bbp_write(rt2x00dev, 105, 0x3C);
699 +       rt2800_bbp_write(rt2x00dev, 106, 0x12);
700 +       rt2800_bbp_write(rt2x00dev, 109, 0x00);
701 +       rt2800_bbp_write(rt2x00dev, 134, 0x10);
702 +       rt2800_bbp_write(rt2x00dev, 135, 0xA6);
703 +       rt2800_bbp_write(rt2x00dev, 137, 0x04);
704 +       rt2800_bbp_write(rt2x00dev, 142, 0x30);
705 +       rt2800_bbp_write(rt2x00dev, 143, 0xF7);
706 +       rt2800_bbp_write(rt2x00dev, 160, 0xEC);
707 +       rt2800_bbp_write(rt2x00dev, 161, 0xC4);
708 +       rt2800_bbp_write(rt2x00dev, 162, 0x77);
709 +       rt2800_bbp_write(rt2x00dev, 163, 0xF9);
710 +       rt2800_bbp_write(rt2x00dev, 164, 0x00);
711 +       rt2800_bbp_write(rt2x00dev, 165, 0x00);
712 +       rt2800_bbp_write(rt2x00dev, 186, 0x00);
713 +       rt2800_bbp_write(rt2x00dev, 187, 0x00);
714 +       rt2800_bbp_write(rt2x00dev, 188, 0x00);
715 +       rt2800_bbp_write(rt2x00dev, 186, 0x00);
716 +       rt2800_bbp_write(rt2x00dev, 187, 0x01);
717 +       rt2800_bbp_write(rt2x00dev, 188, 0x00);
718 +       rt2800_bbp_write(rt2x00dev, 189, 0x00);
719 +
720 +       rt2800_bbp_write(rt2x00dev, 91, 0x06);
721 +       rt2800_bbp_write(rt2x00dev, 92, 0x04);
722 +       rt2800_bbp_write(rt2x00dev, 93, 0x54);
723 +       rt2800_bbp_write(rt2x00dev, 99, 0x50);
724 +       rt2800_bbp_write(rt2x00dev, 148, 0x84);
725 +       rt2800_bbp_write(rt2x00dev, 167, 0x80);
726 +       rt2800_bbp_write(rt2x00dev, 178, 0xFF);
727 +       rt2800_bbp_write(rt2x00dev, 106, 0x13);
728 +
729 +       /* BBP for G band GLRT function (BBP_128 ~ BBP_221) */
730 +       rt2800_bbp_glrt_write(rt2x00dev, 0, 0x00);
731 +       rt2800_bbp_glrt_write(rt2x00dev, 1, 0x14); /* ? see above */
732 +       rt2800_bbp_glrt_write(rt2x00dev, 2, 0x20);
733 +       rt2800_bbp_glrt_write(rt2x00dev, 3, 0x0A);
734 +       rt2800_bbp_glrt_write(rt2x00dev, 10, 0x16);
735 +       rt2800_bbp_glrt_write(rt2x00dev, 11, 0x06);
736 +       rt2800_bbp_glrt_write(rt2x00dev, 12, 0x02);
737 +       rt2800_bbp_glrt_write(rt2x00dev, 13, 0x07);
738 +       rt2800_bbp_glrt_write(rt2x00dev, 14, 0x05);
739 +       rt2800_bbp_glrt_write(rt2x00dev, 15, 0x09);
740 +       rt2800_bbp_glrt_write(rt2x00dev, 16, 0x20);
741 +       rt2800_bbp_glrt_write(rt2x00dev, 17, 0x08);
742 +       rt2800_bbp_glrt_write(rt2x00dev, 18, 0x4A);
743 +       rt2800_bbp_glrt_write(rt2x00dev, 19, 0x00);
744 +       rt2800_bbp_glrt_write(rt2x00dev, 20, 0x00);
745 +       rt2800_bbp_glrt_write(rt2x00dev, 128, 0xE0);
746 +       rt2800_bbp_glrt_write(rt2x00dev, 129, 0x1F);
747 +       rt2800_bbp_glrt_write(rt2x00dev, 130, 0x4F);
748 +       rt2800_bbp_glrt_write(rt2x00dev, 131, 0x32);
749 +       rt2800_bbp_glrt_write(rt2x00dev, 132, 0x08);
750 +       rt2800_bbp_glrt_write(rt2x00dev, 133, 0x28);
751 +       rt2800_bbp_glrt_write(rt2x00dev, 134, 0x19);
752 +       rt2800_bbp_glrt_write(rt2x00dev, 135, 0x0A);
753 +       rt2800_bbp_glrt_write(rt2x00dev, 138, 0x16);
754 +       rt2800_bbp_glrt_write(rt2x00dev, 139, 0x10);
755 +       rt2800_bbp_glrt_write(rt2x00dev, 140, 0x10);
756 +       rt2800_bbp_glrt_write(rt2x00dev, 141, 0x1A);
757 +       rt2800_bbp_glrt_write(rt2x00dev, 142, 0x36);
758 +       rt2800_bbp_glrt_write(rt2x00dev, 143, 0x2C);
759 +       rt2800_bbp_glrt_write(rt2x00dev, 144, 0x26);
760 +       rt2800_bbp_glrt_write(rt2x00dev, 145, 0x24);
761 +       rt2800_bbp_glrt_write(rt2x00dev, 146, 0x42);
762 +       rt2800_bbp_glrt_write(rt2x00dev, 147, 0x40);
763 +       rt2800_bbp_glrt_write(rt2x00dev, 148, 0x30);
764 +       rt2800_bbp_glrt_write(rt2x00dev, 149, 0x29);
765 +       rt2800_bbp_glrt_write(rt2x00dev, 150, 0x4C);
766 +       rt2800_bbp_glrt_write(rt2x00dev, 151, 0x46);
767 +       rt2800_bbp_glrt_write(rt2x00dev, 152, 0x3D);
768 +       rt2800_bbp_glrt_write(rt2x00dev, 153, 0x40);
769 +       rt2800_bbp_glrt_write(rt2x00dev, 154, 0x3E);
770 +       rt2800_bbp_glrt_write(rt2x00dev, 155, 0x38);
771 +       rt2800_bbp_glrt_write(rt2x00dev, 156, 0x3D);
772 +       rt2800_bbp_glrt_write(rt2x00dev, 157, 0x2F);
773 +       rt2800_bbp_glrt_write(rt2x00dev, 158, 0x3C);
774 +       rt2800_bbp_glrt_write(rt2x00dev, 159, 0x34);
775 +       rt2800_bbp_glrt_write(rt2x00dev, 160, 0x2C);
776 +       rt2800_bbp_glrt_write(rt2x00dev, 161, 0x2F);
777 +       rt2800_bbp_glrt_write(rt2x00dev, 162, 0x3C);
778 +       rt2800_bbp_glrt_write(rt2x00dev, 163, 0x35);
779 +       rt2800_bbp_glrt_write(rt2x00dev, 164, 0x2E);
780 +       rt2800_bbp_glrt_write(rt2x00dev, 165, 0x2F);
781 +       rt2800_bbp_glrt_write(rt2x00dev, 166, 0x49);
782 +       rt2800_bbp_glrt_write(rt2x00dev, 167, 0x41);
783 +       rt2800_bbp_glrt_write(rt2x00dev, 168, 0x36);
784 +       rt2800_bbp_glrt_write(rt2x00dev, 169, 0x39);
785 +       rt2800_bbp_glrt_write(rt2x00dev, 170, 0x30);
786 +       rt2800_bbp_glrt_write(rt2x00dev, 171, 0x30);
787 +       rt2800_bbp_glrt_write(rt2x00dev, 172, 0x0E);
788 +       rt2800_bbp_glrt_write(rt2x00dev, 173, 0x0D);
789 +       rt2800_bbp_glrt_write(rt2x00dev, 174, 0x28);
790 +       rt2800_bbp_glrt_write(rt2x00dev, 175, 0x21);
791 +       rt2800_bbp_glrt_write(rt2x00dev, 176, 0x1C);
792 +       rt2800_bbp_glrt_write(rt2x00dev, 177, 0x16);
793 +       rt2800_bbp_glrt_write(rt2x00dev, 178, 0x50);
794 +       rt2800_bbp_glrt_write(rt2x00dev, 179, 0x4A);
795 +       rt2800_bbp_glrt_write(rt2x00dev, 180, 0x43);
796 +       rt2800_bbp_glrt_write(rt2x00dev, 181, 0x50);
797 +       rt2800_bbp_glrt_write(rt2x00dev, 182, 0x10);
798 +       rt2800_bbp_glrt_write(rt2x00dev, 183, 0x10);
799 +       rt2800_bbp_glrt_write(rt2x00dev, 184, 0x10);
800 +       rt2800_bbp_glrt_write(rt2x00dev, 185, 0x10);
801 +       rt2800_bbp_glrt_write(rt2x00dev, 200, 0x7D);
802 +       rt2800_bbp_glrt_write(rt2x00dev, 201, 0x14);
803 +       rt2800_bbp_glrt_write(rt2x00dev, 202, 0x32);
804 +       rt2800_bbp_glrt_write(rt2x00dev, 203, 0x2C);
805 +       rt2800_bbp_glrt_write(rt2x00dev, 204, 0x36);
806 +       rt2800_bbp_glrt_write(rt2x00dev, 205, 0x4C);
807 +       rt2800_bbp_glrt_write(rt2x00dev, 206, 0x43);
808 +       rt2800_bbp_glrt_write(rt2x00dev, 207, 0x2C);
809 +       rt2800_bbp_glrt_write(rt2x00dev, 208, 0x2E);
810 +       rt2800_bbp_glrt_write(rt2x00dev, 209, 0x36);
811 +       rt2800_bbp_glrt_write(rt2x00dev, 210, 0x30);
812 +       rt2800_bbp_glrt_write(rt2x00dev, 211, 0x6E);
813 +
814 +       /* BBP for G band DCOC function */
815 +       rt2800_bbp_dcoc_write(rt2x00dev, 140, 0x0C);
816 +       rt2800_bbp_dcoc_write(rt2x00dev, 141, 0x00);
817 +       rt2800_bbp_dcoc_write(rt2x00dev, 142, 0x10);
818 +       rt2800_bbp_dcoc_write(rt2x00dev, 143, 0x10);
819 +       rt2800_bbp_dcoc_write(rt2x00dev, 144, 0x10);
820 +       rt2800_bbp_dcoc_write(rt2x00dev, 145, 0x10);
821 +       rt2800_bbp_dcoc_write(rt2x00dev, 146, 0x08);
822 +       rt2800_bbp_dcoc_write(rt2x00dev, 147, 0x40);
823 +       rt2800_bbp_dcoc_write(rt2x00dev, 148, 0x04);
824 +       rt2800_bbp_dcoc_write(rt2x00dev, 149, 0x04);
825 +       rt2800_bbp_dcoc_write(rt2x00dev, 150, 0x08);
826 +       rt2800_bbp_dcoc_write(rt2x00dev, 151, 0x08);
827 +       rt2800_bbp_dcoc_write(rt2x00dev, 152, 0x03);
828 +       rt2800_bbp_dcoc_write(rt2x00dev, 153, 0x03);
829 +       rt2800_bbp_dcoc_write(rt2x00dev, 154, 0x03);
830 +       rt2800_bbp_dcoc_write(rt2x00dev, 155, 0x02);
831 +       rt2800_bbp_dcoc_write(rt2x00dev, 156, 0x40);
832 +       rt2800_bbp_dcoc_write(rt2x00dev, 157, 0x40);
833 +       rt2800_bbp_dcoc_write(rt2x00dev, 158, 0x64);
834 +       rt2800_bbp_dcoc_write(rt2x00dev, 159, 0x64);
835 +
836 +       rt2800_bbp4_mac_if_ctrl(rt2x00dev);
837 +}
838 +
839  static void rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
840  {
841         unsigned int i;
842 @@ -6117,7 +6750,10 @@ static void rt2800_init_bbp(struct rt2x0
843                 return;
844         case RT5390:
845         case RT5392:
846 -               rt2800_init_bbp_53xx(rt2x00dev);
847 +               if (rt2x00dev->chip.rf == RF7620)
848 +                       rt2800_init_bbp_7620(rt2x00dev);
849 +               else
850 +                       rt2800_init_bbp_53xx(rt2x00dev);
851                 break;
852         case RT5592:
853                 rt2800_init_bbp_5592(rt2x00dev);
854 @@ -7331,6 +7967,295 @@ static void rt2800_init_rfcsr_5592(struc
855         rt2800_led_open_drain_enable(rt2x00dev);
856  }
857  
858 +static void rt2800_init_rfcsr_7620(struct rt2x00_dev *rt2x00dev)
859 +{
860 +       u8 rfvalue;
861 +       u16 freq;
862 +
863 +       /* Initialize RF central register to default value */
864 +       rt2800_rfcsr_write(rt2x00dev, 0, 0x02);
865 +       rt2800_rfcsr_write(rt2x00dev, 1, 0x03);
866 +       rt2800_rfcsr_write(rt2x00dev, 2, 0x33);
867 +       rt2800_rfcsr_write(rt2x00dev, 3, 0xFF);
868 +       rt2800_rfcsr_write(rt2x00dev, 4, 0x0C);
869 +       rt2800_rfcsr_write(rt2x00dev, 5, 0x40); /* Read only */
870 +       rt2800_rfcsr_write(rt2x00dev, 6, 0x00);
871 +       rt2800_rfcsr_write(rt2x00dev, 7, 0x00);
872 +       rt2800_rfcsr_write(rt2x00dev, 8, 0x00);
873 +       rt2800_rfcsr_write(rt2x00dev, 9, 0x00);
874 +       rt2800_rfcsr_write(rt2x00dev, 10, 0x00);
875 +       rt2800_rfcsr_write(rt2x00dev, 11, 0x00);
876 +       /* rt2800_rfcsr_write(rt2x00dev, 12, 0x43); *//* EEPROM */
877 +       rt2800_rfcsr_write(rt2x00dev, 13, 0x00);
878 +       rt2800_rfcsr_write(rt2x00dev, 14, 0x40);
879 +       rt2800_rfcsr_write(rt2x00dev, 15, 0x22);
880 +       rt2800_rfcsr_write(rt2x00dev, 16, 0x4C);
881 +       rt2800_rfcsr_write(rt2x00dev, 17, 0x00);
882 +       rt2800_rfcsr_write(rt2x00dev, 18, 0x00);
883 +       rt2800_rfcsr_write(rt2x00dev, 19, 0x00);
884 +       rt2800_rfcsr_write(rt2x00dev, 20, 0xA0);
885 +       rt2800_rfcsr_write(rt2x00dev, 21, 0x12);
886 +       rt2800_rfcsr_write(rt2x00dev, 22, 0x07);
887 +       rt2800_rfcsr_write(rt2x00dev, 23, 0x13);
888 +       rt2800_rfcsr_write(rt2x00dev, 24, 0xFE);
889 +       rt2800_rfcsr_write(rt2x00dev, 25, 0x24);
890 +       rt2800_rfcsr_write(rt2x00dev, 26, 0x7A);
891 +       rt2800_rfcsr_write(rt2x00dev, 27, 0x00);
892 +       rt2800_rfcsr_write(rt2x00dev, 28, 0x00);
893 +       rt2800_rfcsr_write(rt2x00dev, 29, 0x05);
894 +       rt2800_rfcsr_write(rt2x00dev, 30, 0x00);
895 +       rt2800_rfcsr_write(rt2x00dev, 31, 0x00);
896 +       rt2800_rfcsr_write(rt2x00dev, 32, 0x00);
897 +       rt2800_rfcsr_write(rt2x00dev, 33, 0x00);
898 +       rt2800_rfcsr_write(rt2x00dev, 34, 0x00);
899 +       rt2800_rfcsr_write(rt2x00dev, 35, 0x00);
900 +       rt2800_rfcsr_write(rt2x00dev, 36, 0x00);
901 +       rt2800_rfcsr_write(rt2x00dev, 37, 0x00);
902 +       rt2800_rfcsr_write(rt2x00dev, 38, 0x00);
903 +       rt2800_rfcsr_write(rt2x00dev, 39, 0x00);
904 +       rt2800_rfcsr_write(rt2x00dev, 40, 0x00);
905 +       rt2800_rfcsr_write(rt2x00dev, 41, 0xD0);
906 +       rt2800_rfcsr_write(rt2x00dev, 42, 0x5B);
907 +       rt2800_rfcsr_write(rt2x00dev, 43, 0x00);
908 +
909 +       rt2800_rfcsr_write(rt2x00dev, 11, 0x21);
910 +       if (rt2800_clk_is_20mhz(rt2x00dev))
911 +               rt2800_rfcsr_write(rt2x00dev, 13, 0x03);
912 +       else
913 +               rt2800_rfcsr_write(rt2x00dev, 13, 0x00);
914 +       rt2800_rfcsr_write(rt2x00dev, 14, 0x7C);
915 +       rt2800_rfcsr_write(rt2x00dev, 16, 0x80);
916 +       rt2800_rfcsr_write(rt2x00dev, 17, 0x99);
917 +       rt2800_rfcsr_write(rt2x00dev, 18, 0x99);
918 +       rt2800_rfcsr_write(rt2x00dev, 19, 0x09);
919 +       rt2800_rfcsr_write(rt2x00dev, 20, 0x50);
920 +       rt2800_rfcsr_write(rt2x00dev, 21, 0xB0);
921 +       rt2800_rfcsr_write(rt2x00dev, 22, 0x00);
922 +       rt2800_rfcsr_write(rt2x00dev, 23, 0x06);
923 +       rt2800_rfcsr_write(rt2x00dev, 24, 0x00);
924 +       rt2800_rfcsr_write(rt2x00dev, 25, 0x00);
925 +       rt2800_rfcsr_write(rt2x00dev, 26, 0x5D);
926 +       rt2800_rfcsr_write(rt2x00dev, 27, 0x00);
927 +       rt2800_rfcsr_write(rt2x00dev, 28, 0x61);
928 +       rt2800_rfcsr_write(rt2x00dev, 29, 0xB5);
929 +       rt2800_rfcsr_write(rt2x00dev, 43, 0x02);
930 +
931 +       rt2800_rfcsr_write(rt2x00dev, 28, 0x62);
932 +       rt2800_rfcsr_write(rt2x00dev, 29, 0xAD);
933 +       rt2800_rfcsr_write(rt2x00dev, 39, 0x80);
934 +       /* RTMP_TEMPERATURE_CALIBRATION */
935 +       /* rt2800_rfcsr_write(rt2x00dev, 34, 0x23); */
936 +       /* rt2800_rfcsr_write(rt2x00dev, 35, 0x01); */
937 +
938 +       /* use rt2800_adjust_freq_offset ? */
939 +       rt2800_eeprom_read(rt2x00dev, EEPROM_FREQ, &freq);
940 +       rfvalue = freq & 0xff;
941 +       rt2800_rfcsr_write(rt2x00dev, 12, rfvalue);
942 +
943 +       /* Initialize RF channel register to default value */
944 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 0, 0x03);
945 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 1, 0x00);
946 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 2, 0x00);
947 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 3, 0x00);
948 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 4, 0x00);
949 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 5, 0x08);
950 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 6, 0x00);
951 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 7, 0x51);
952 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 8, 0x53);
953 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 9, 0x16);
954 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 10, 0x61);
955 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 11, 0x53);
956 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 12, 0x22);
957 +       /* rt2800_rfcsr_write_chanreg(rt2x00dev, 13, 0x3D); */ /* fails */
958 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 14, 0x06);
959 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 15, 0x13);
960 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 16, 0x22);
961 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 17, 0x27);
962 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 18, 0x02);
963 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 19, 0xA7);
964 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 20, 0x01);
965 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 21, 0x52);
966 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 22, 0x80);
967 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 23, 0xB3);
968 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 24, 0x00);
969 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 25, 0x00);
970 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 26, 0x00);
971 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 27, 0x00);
972 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 28, 0x5C);
973 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 29, 0x6B);
974 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 30, 0x6B);
975 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 31, 0x31);
976 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 32, 0x5D);
977 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 33, 0x00);
978 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 34, 0xE6);
979 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 35, 0x55);
980 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 36, 0x00);
981 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 37, 0xBB);
982 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 38, 0xB3);
983 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 39, 0xB3);
984 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 40, 0x03);
985 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 41, 0x00);
986 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 42, 0x00);
987 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 43, 0xB3);
988 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 44, 0xD3);
989 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 45, 0xD5);
990 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 46, 0x07);
991 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 47, 0x68);
992 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 48, 0xEF);
993 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 49, 0x1C);
994 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 54, 0x07);
995 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0xA8);
996 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 56, 0x85);
997 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 57, 0x10);
998 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 58, 0x07);
999 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 59, 0x6A);
1000 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 60, 0x85);
1001 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 61, 0x10);
1002 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 62, 0x1C);
1003 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 63, 0x00);
1004 +
1005 +       rt2800_rfcsr_write_bank(rt2x00dev, 6, 45, 0xC5);
1006 +
1007 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 9, 0x47);
1008 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 10, 0x71);
1009 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 11, 0x33);
1010 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 14, 0x0E);
1011 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 17, 0x23);
1012 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 19, 0xA4);
1013 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 20, 0x02);
1014 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 21, 0x12);
1015 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 28, 0x1C);
1016 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 29, 0xEB);
1017 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 32, 0x7D);
1018 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 34, 0xD6);
1019 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 36, 0x08);
1020 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 38, 0xB4);
1021 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 43, 0xD3);
1022 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 44, 0xB3);
1023 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 45, 0xD5);
1024 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 46, 0x27);
1025 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 47, 0x69);
1026 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 48, 0xFF);
1027 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 54, 0x20);
1028 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0x66);
1029 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 56, 0xFF);
1030 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 57, 0x1C);
1031 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 58, 0x20);
1032 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 59, 0x6B);
1033 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 60, 0xF7);
1034 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 61, 0x09);
1035 +
1036 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 10, 0x51);
1037 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 14, 0x06);
1038 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 19, 0xA7);
1039 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 28, 0x2C);
1040 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0x64);
1041 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 8, 0x51);
1042 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 9, 0x36);
1043 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 11, 0x53);
1044 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 14, 0x16);
1045 +
1046 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 47, 0x6C);
1047 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 48, 0xFC);
1048 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 49, 0x1F);
1049 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 54, 0x27);
1050 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0x66);
1051 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 59, 0x6B);
1052 +
1053 +       /* Initialize RF channel register for DRQFN */
1054 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 43, 0xD3);
1055 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 44, 0xE3);
1056 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 45, 0xE5);
1057 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 47, 0x28);
1058 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0x68);
1059 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 56, 0xF7);
1060 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 58, 0x02);
1061 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 60, 0xC7);
1062 +
1063 +       /* reduce power consumption */
1064 +/*     rt2800_rfcsr_write_chanreg(rt2x00dev, 43, 0x53);
1065 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 44, 0x53);
1066 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 45, 0x53);
1067 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 47, 0x64);
1068 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 48, 0x4F);
1069 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 49, 0x02);
1070 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0x64);
1071 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 56, 0x4F);
1072 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 57, 0x02);
1073 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 58, 0x27);
1074 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 59, 0x64);
1075 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 60, 0x4F);
1076 +       rt2800_rfcsr_write_chanreg(rt2x00dev, 61, 0x02);
1077 +*/
1078 +       /* Initialize RF DC calibration register to default value */
1079 +       rt2800_rfcsr_write_dccal(rt2x00dev, 0, 0x47);
1080 +       rt2800_rfcsr_write_dccal(rt2x00dev, 1, 0x00);
1081 +       rt2800_rfcsr_write_dccal(rt2x00dev, 2, 0x00);
1082 +       rt2800_rfcsr_write_dccal(rt2x00dev, 3, 0x00);
1083 +       rt2800_rfcsr_write_dccal(rt2x00dev, 4, 0x00);
1084 +       rt2800_rfcsr_write_dccal(rt2x00dev, 5, 0x00);
1085 +       rt2800_rfcsr_write_dccal(rt2x00dev, 6, 0x10);
1086 +       rt2800_rfcsr_write_dccal(rt2x00dev, 7, 0x10);
1087 +       rt2800_rfcsr_write_dccal(rt2x00dev, 8, 0x04);
1088 +       rt2800_rfcsr_write_dccal(rt2x00dev, 9, 0x00);
1089 +       rt2800_rfcsr_write_dccal(rt2x00dev, 10, 0x07);
1090 +       rt2800_rfcsr_write_dccal(rt2x00dev, 11, 0x01);
1091 +       rt2800_rfcsr_write_dccal(rt2x00dev, 12, 0x07);
1092 +       rt2800_rfcsr_write_dccal(rt2x00dev, 13, 0x07);
1093 +       rt2800_rfcsr_write_dccal(rt2x00dev, 14, 0x07);
1094 +       rt2800_rfcsr_write_dccal(rt2x00dev, 15, 0x20);
1095 +       rt2800_rfcsr_write_dccal(rt2x00dev, 16, 0x22);
1096 +       rt2800_rfcsr_write_dccal(rt2x00dev, 17, 0x00);
1097 +       rt2800_rfcsr_write_dccal(rt2x00dev, 18, 0x00);
1098 +       rt2800_rfcsr_write_dccal(rt2x00dev, 19, 0x00);
1099 +       rt2800_rfcsr_write_dccal(rt2x00dev, 20, 0x00);
1100 +       rt2800_rfcsr_write_dccal(rt2x00dev, 21, 0xF1);
1101 +       rt2800_rfcsr_write_dccal(rt2x00dev, 22, 0x11);
1102 +       rt2800_rfcsr_write_dccal(rt2x00dev, 23, 0x02);
1103 +       rt2800_rfcsr_write_dccal(rt2x00dev, 24, 0x41);
1104 +       rt2800_rfcsr_write_dccal(rt2x00dev, 25, 0x20);
1105 +       rt2800_rfcsr_write_dccal(rt2x00dev, 26, 0x00);
1106 +       rt2800_rfcsr_write_dccal(rt2x00dev, 27, 0xD7);
1107 +       rt2800_rfcsr_write_dccal(rt2x00dev, 28, 0xA2);
1108 +       rt2800_rfcsr_write_dccal(rt2x00dev, 29, 0x20);
1109 +       rt2800_rfcsr_write_dccal(rt2x00dev, 30, 0x49);
1110 +       rt2800_rfcsr_write_dccal(rt2x00dev, 31, 0x20);
1111 +       rt2800_rfcsr_write_dccal(rt2x00dev, 32, 0x04);
1112 +       rt2800_rfcsr_write_dccal(rt2x00dev, 33, 0xF1);
1113 +       rt2800_rfcsr_write_dccal(rt2x00dev, 34, 0xA1);
1114 +       rt2800_rfcsr_write_dccal(rt2x00dev, 35, 0x01);
1115 +       rt2800_rfcsr_write_dccal(rt2x00dev, 41, 0x00);
1116 +       rt2800_rfcsr_write_dccal(rt2x00dev, 42, 0x00);
1117 +       rt2800_rfcsr_write_dccal(rt2x00dev, 43, 0x00);
1118 +       rt2800_rfcsr_write_dccal(rt2x00dev, 44, 0x00);
1119 +       rt2800_rfcsr_write_dccal(rt2x00dev, 45, 0x00);
1120 +       rt2800_rfcsr_write_dccal(rt2x00dev, 46, 0x00);
1121 +       rt2800_rfcsr_write_dccal(rt2x00dev, 47, 0x3E);
1122 +       rt2800_rfcsr_write_dccal(rt2x00dev, 48, 0x3D);
1123 +       rt2800_rfcsr_write_dccal(rt2x00dev, 49, 0x3E);
1124 +       rt2800_rfcsr_write_dccal(rt2x00dev, 50, 0x3D);
1125 +       rt2800_rfcsr_write_dccal(rt2x00dev, 51, 0x3E);
1126 +       rt2800_rfcsr_write_dccal(rt2x00dev, 52, 0x3D);
1127 +       rt2800_rfcsr_write_dccal(rt2x00dev, 53, 0x00);
1128 +       rt2800_rfcsr_write_dccal(rt2x00dev, 54, 0x00);
1129 +       rt2800_rfcsr_write_dccal(rt2x00dev, 55, 0x00);
1130 +       rt2800_rfcsr_write_dccal(rt2x00dev, 56, 0x00);
1131 +       rt2800_rfcsr_write_dccal(rt2x00dev, 57, 0x00);
1132 +       rt2800_rfcsr_write_dccal(rt2x00dev, 58, 0x10);
1133 +       rt2800_rfcsr_write_dccal(rt2x00dev, 59, 0x10);
1134 +       rt2800_rfcsr_write_dccal(rt2x00dev, 60, 0x0A);
1135 +       rt2800_rfcsr_write_dccal(rt2x00dev, 61, 0x00);
1136 +       rt2800_rfcsr_write_dccal(rt2x00dev, 62, 0x00);
1137 +       rt2800_rfcsr_write_dccal(rt2x00dev, 63, 0x00);
1138 +
1139 +       rt2800_rfcsr_write_dccal(rt2x00dev, 3, 0x08);
1140 +       rt2800_rfcsr_write_dccal(rt2x00dev, 4, 0x04);
1141 +       rt2800_rfcsr_write_dccal(rt2x00dev, 5, 0x20);
1142 +
1143 +       rt2800_rfcsr_write_dccal(rt2x00dev, 5, 0x00);
1144 +       rt2800_rfcsr_write_dccal(rt2x00dev, 17, 0x7C);
1145 +}
1146 +
1147  static void rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
1148  {
1149         if (rt2800_is_305x_soc(rt2x00dev)) {
1150 @@ -7366,7 +8291,10 @@ static void rt2800_init_rfcsr(struct rt2
1151                 rt2800_init_rfcsr_5350(rt2x00dev);
1152                 break;
1153         case RT5390:
1154 -               rt2800_init_rfcsr_5390(rt2x00dev);
1155 +               if (rt2x00dev->chip.rf == RF7620)
1156 +                       rt2800_init_rfcsr_7620(rt2x00dev);
1157 +               else
1158 +                       rt2800_init_rfcsr_5390(rt2x00dev);
1159                 break;
1160         case RT5392:
1161                 rt2800_init_rfcsr_5392(rt2x00dev);
1162 @@ -7780,6 +8708,7 @@ static int rt2800_init_eeprom(struct rt2
1163         case RF5390:
1164         case RF5392:
1165         case RF5592:
1166 +       case RF7620:
1167                 break;
1168         default:
1169                 rt2x00_err(rt2x00dev, "Invalid RF chipset 0x%04x detected\n",
1170 @@ -8354,6 +9283,7 @@ static int rt2800_probe_hw_mode(struct r
1171         case RF5372:
1172         case RF5390:
1173         case RF5392:
1174 +       case RF7620:
1175                 spec->num_channels = 14;
1176                 if (rt2800_clk_is_20mhz(rt2x00dev))
1177                         spec->channels = rf_vals_3x_xtal20;
1178 @@ -8498,6 +9428,7 @@ static int rt2800_probe_hw_mode(struct r
1179         case RF5390:
1180         case RF5392:
1181         case RF5592:
1182 +       case RF7620:
1183                 __set_bit(CAPABILITY_VCO_RECALIBRATION, &rt2x00dev->cap_flags);
1184                 break;
1185         }