diff options
author | Canek Peláez Valdés <canek@ciencias.unam.mx> | 2014-08-24 20:06:11 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-08-28 14:49:39 -0400 |
commit | ac0372abf8524a7572a9cdaac6495eb2eba20457 (patch) | |
tree | 6fb9343188a7b28c40b410d915493e55c0e0bda4 | |
parent | 4c7e9aee2d3f738924ba04baecf7bf854e72f07c (diff) |
rt2x00: support Ralink 5362.
Signed-off-by: Canek Peláez Valdés <canek@ciencias.unam.mx>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800.h | 4 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800lib.c | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h index a394a9a95919..b7434df51e7c 100644 --- a/drivers/net/wireless/rt2x00/rt2800.h +++ b/drivers/net/wireless/rt2x00/rt2800.h | |||
@@ -52,6 +52,7 @@ | |||
52 | * RF5592 2.4G/5G 2T2R | 52 | * RF5592 2.4G/5G 2T2R |
53 | * RF3070 2.4G 1T1R | 53 | * RF3070 2.4G 1T1R |
54 | * RF5360 2.4G 1T1R | 54 | * RF5360 2.4G 1T1R |
55 | * RF5362 2.4G 1T1R | ||
55 | * RF5370 2.4G 1T1R | 56 | * RF5370 2.4G 1T1R |
56 | * RF5390 2.4G 1T1R | 57 | * RF5390 2.4G 1T1R |
57 | */ | 58 | */ |
@@ -72,6 +73,7 @@ | |||
72 | #define RF3070 0x3070 | 73 | #define RF3070 0x3070 |
73 | #define RF3290 0x3290 | 74 | #define RF3290 0x3290 |
74 | #define RF5360 0x5360 | 75 | #define RF5360 0x5360 |
76 | #define RF5362 0x5362 | ||
75 | #define RF5370 0x5370 | 77 | #define RF5370 0x5370 |
76 | #define RF5372 0x5372 | 78 | #define RF5372 0x5372 |
77 | #define RF5390 0x5390 | 79 | #define RF5390 0x5390 |
@@ -2145,7 +2147,7 @@ struct mac_iveiv_entry { | |||
2145 | /* Bits [7-4] for RF3320 (RT3370/RT3390), on other chipsets reserved */ | 2147 | /* Bits [7-4] for RF3320 (RT3370/RT3390), on other chipsets reserved */ |
2146 | #define RFCSR3_PA1_BIAS_CCK FIELD8(0x70) | 2148 | #define RFCSR3_PA1_BIAS_CCK FIELD8(0x70) |
2147 | #define RFCSR3_PA2_CASCODE_BIAS_CCKK FIELD8(0x80) | 2149 | #define RFCSR3_PA2_CASCODE_BIAS_CCKK FIELD8(0x80) |
2148 | /* Bits for RF3290/RF5360/RF5370/RF5372/RF5390/RF5392 */ | 2150 | /* Bits for RF3290/RF5360/RF5362/RF5370/RF5372/RF5390/RF5392 */ |
2149 | #define RFCSR3_VCOCAL_EN FIELD8(0x80) | 2151 | #define RFCSR3_VCOCAL_EN FIELD8(0x80) |
2150 | /* Bits for RF3050 */ | 2152 | /* Bits for RF3050 */ |
2151 | #define RFCSR3_BIT1 FIELD8(0x02) | 2153 | #define RFCSR3_BIT1 FIELD8(0x02) |
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 893c9d5f3d6f..9f57a2db791c 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c | |||
@@ -3186,6 +3186,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, | |||
3186 | break; | 3186 | break; |
3187 | case RF3070: | 3187 | case RF3070: |
3188 | case RF5360: | 3188 | case RF5360: |
3189 | case RF5362: | ||
3189 | case RF5370: | 3190 | case RF5370: |
3190 | case RF5372: | 3191 | case RF5372: |
3191 | case RF5390: | 3192 | case RF5390: |
@@ -3203,6 +3204,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, | |||
3203 | rt2x00_rf(rt2x00dev, RF3290) || | 3204 | rt2x00_rf(rt2x00dev, RF3290) || |
3204 | rt2x00_rf(rt2x00dev, RF3322) || | 3205 | rt2x00_rf(rt2x00dev, RF3322) || |
3205 | rt2x00_rf(rt2x00dev, RF5360) || | 3206 | rt2x00_rf(rt2x00dev, RF5360) || |
3207 | rt2x00_rf(rt2x00dev, RF5362) || | ||
3206 | rt2x00_rf(rt2x00dev, RF5370) || | 3208 | rt2x00_rf(rt2x00dev, RF5370) || |
3207 | rt2x00_rf(rt2x00dev, RF5372) || | 3209 | rt2x00_rf(rt2x00dev, RF5372) || |
3208 | rt2x00_rf(rt2x00dev, RF5390) || | 3210 | rt2x00_rf(rt2x00dev, RF5390) || |
@@ -4317,6 +4319,7 @@ void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev) | |||
4317 | case RF3070: | 4319 | case RF3070: |
4318 | case RF3290: | 4320 | case RF3290: |
4319 | case RF5360: | 4321 | case RF5360: |
4322 | case RF5362: | ||
4320 | case RF5370: | 4323 | case RF5370: |
4321 | case RF5372: | 4324 | case RF5372: |
4322 | case RF5390: | 4325 | case RF5390: |
@@ -7095,6 +7098,7 @@ static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev) | |||
7095 | case RF3320: | 7098 | case RF3320: |
7096 | case RF3322: | 7099 | case RF3322: |
7097 | case RF5360: | 7100 | case RF5360: |
7101 | case RF5362: | ||
7098 | case RF5370: | 7102 | case RF5370: |
7099 | case RF5372: | 7103 | case RF5372: |
7100 | case RF5390: | 7104 | case RF5390: |
@@ -7551,6 +7555,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) | |||
7551 | case RF3320: | 7555 | case RF3320: |
7552 | case RF3322: | 7556 | case RF3322: |
7553 | case RF5360: | 7557 | case RF5360: |
7558 | case RF5362: | ||
7554 | case RF5370: | 7559 | case RF5370: |
7555 | case RF5372: | 7560 | case RF5372: |
7556 | case RF5390: | 7561 | case RF5390: |
@@ -7680,6 +7685,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) | |||
7680 | case RF3070: | 7685 | case RF3070: |
7681 | case RF3290: | 7686 | case RF3290: |
7682 | case RF5360: | 7687 | case RF5360: |
7688 | case RF5362: | ||
7683 | case RF5370: | 7689 | case RF5370: |
7684 | case RF5372: | 7690 | case RF5372: |
7685 | case RF5390: | 7691 | case RF5390: |