diff options
author | villacis@palosanto.com <villacis@palosanto.com> | 2012-05-16 15:07:12 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-06-05 15:32:11 -0400 |
commit | ccf91bd678d74e1e98a153539cd07a62991d6610 (patch) | |
tree | 0bd4e1d5d419e1e1250fce066e576791c1a34144 /drivers | |
parent | 51ca9d8db280b960345e7306e6a036dd3880ecff (diff) |
rt2x00: Add support for RT5360 based PCI devices.
This chip is used at least by the D-Link DWA-525 adapter.
Signed-off-by: Alex Villac<ED>s Lasso <a_villacis@palosanto.com>
Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800lib.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800pci.c | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h index 9348521e0832..6403f49da419 100644 --- a/drivers/net/wireless/rt2x00/rt2800.h +++ b/drivers/net/wireless/rt2x00/rt2800.h | |||
@@ -51,6 +51,7 @@ | |||
51 | * RF3320 2.4G 1T1R(RT3350/RT3370/RT3390) | 51 | * RF3320 2.4G 1T1R(RT3350/RT3370/RT3390) |
52 | * RF3322 2.4G 2T2R(RT3352/RT3371/RT3372/RT3391/RT3392) | 52 | * RF3322 2.4G 2T2R(RT3352/RT3371/RT3372/RT3391/RT3392) |
53 | * RF3053 2.4G/5G 3T3R(RT3883/RT3563/RT3573/RT3593/RT3662) | 53 | * RF3053 2.4G/5G 3T3R(RT3883/RT3563/RT3573/RT3593/RT3662) |
54 | * RF5360 2.4G 1T1R | ||
54 | * RF5370 2.4G 1T1R | 55 | * RF5370 2.4G 1T1R |
55 | * RF5390 2.4G 1T1R | 56 | * RF5390 2.4G 1T1R |
56 | */ | 57 | */ |
@@ -67,6 +68,7 @@ | |||
67 | #define RF3320 0x000b | 68 | #define RF3320 0x000b |
68 | #define RF3322 0x000c | 69 | #define RF3322 0x000c |
69 | #define RF3053 0x000d | 70 | #define RF3053 0x000d |
71 | #define RF5360 0x5360 | ||
70 | #define RF5370 0x5370 | 72 | #define RF5370 0x5370 |
71 | #define RF5372 0x5372 | 73 | #define RF5372 0x5372 |
72 | #define RF5390 0x5390 | 74 | #define RF5390 0x5390 |
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index dfc90d34be6d..11488e743f08 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c | |||
@@ -2060,6 +2060,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, | |||
2060 | case RF3052: | 2060 | case RF3052: |
2061 | rt2800_config_channel_rf3052(rt2x00dev, conf, rf, info); | 2061 | rt2800_config_channel_rf3052(rt2x00dev, conf, rf, info); |
2062 | break; | 2062 | break; |
2063 | case RF5360: | ||
2063 | case RF5370: | 2064 | case RF5370: |
2064 | case RF5372: | 2065 | case RF5372: |
2065 | case RF5390: | 2066 | case RF5390: |
@@ -2549,6 +2550,7 @@ void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev) | |||
2549 | rt2x00_set_field8(&rfcsr, RFCSR7_RF_TUNING, 1); | 2550 | rt2x00_set_field8(&rfcsr, RFCSR7_RF_TUNING, 1); |
2550 | rt2800_rfcsr_write(rt2x00dev, 7, rfcsr); | 2551 | rt2800_rfcsr_write(rt2x00dev, 7, rfcsr); |
2551 | break; | 2552 | break; |
2553 | case RF5360: | ||
2552 | case RF5370: | 2554 | case RF5370: |
2553 | case RF5372: | 2555 | case RF5372: |
2554 | case RF5390: | 2556 | case RF5390: |
@@ -4263,6 +4265,7 @@ int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev) | |||
4263 | case RF3022: | 4265 | case RF3022: |
4264 | case RF3052: | 4266 | case RF3052: |
4265 | case RF3320: | 4267 | case RF3320: |
4268 | case RF5360: | ||
4266 | case RF5370: | 4269 | case RF5370: |
4267 | case RF5372: | 4270 | case RF5372: |
4268 | case RF5390: | 4271 | case RF5390: |
@@ -4577,6 +4580,7 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) | |||
4577 | rt2x00_rf(rt2x00dev, RF3021) || | 4580 | rt2x00_rf(rt2x00dev, RF3021) || |
4578 | rt2x00_rf(rt2x00dev, RF3022) || | 4581 | rt2x00_rf(rt2x00dev, RF3022) || |
4579 | rt2x00_rf(rt2x00dev, RF3320) || | 4582 | rt2x00_rf(rt2x00dev, RF3320) || |
4583 | rt2x00_rf(rt2x00dev, RF5360) || | ||
4580 | rt2x00_rf(rt2x00dev, RF5370) || | 4584 | rt2x00_rf(rt2x00dev, RF5370) || |
4581 | rt2x00_rf(rt2x00dev, RF5372) || | 4585 | rt2x00_rf(rt2x00dev, RF5372) || |
4582 | rt2x00_rf(rt2x00dev, RF5390)) { | 4586 | rt2x00_rf(rt2x00dev, RF5390)) { |
@@ -4662,6 +4666,7 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) | |||
4662 | case RF3022: | 4666 | case RF3022: |
4663 | case RF3320: | 4667 | case RF3320: |
4664 | case RF3052: | 4668 | case RF3052: |
4669 | case RF5360: | ||
4665 | case RF5370: | 4670 | case RF5370: |
4666 | case RF5372: | 4671 | case RF5372: |
4667 | case RF5390: | 4672 | case RF5390: |
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c index cad25bfebd7a..206158b67426 100644 --- a/drivers/net/wireless/rt2x00/rt2800pci.c +++ b/drivers/net/wireless/rt2x00/rt2800pci.c | |||
@@ -1188,6 +1188,7 @@ static DEFINE_PCI_DEVICE_TABLE(rt2800pci_device_table) = { | |||
1188 | { PCI_DEVICE(0x1814, 0x3593) }, | 1188 | { PCI_DEVICE(0x1814, 0x3593) }, |
1189 | #endif | 1189 | #endif |
1190 | #ifdef CONFIG_RT2800PCI_RT53XX | 1190 | #ifdef CONFIG_RT2800PCI_RT53XX |
1191 | { PCI_DEVICE(0x1814, 0x5360) }, | ||
1191 | { PCI_DEVICE(0x1814, 0x5362) }, | 1192 | { PCI_DEVICE(0x1814, 0x5362) }, |
1192 | { PCI_DEVICE(0x1814, 0x5390) }, | 1193 | { PCI_DEVICE(0x1814, 0x5390) }, |
1193 | { PCI_DEVICE(0x1814, 0x5392) }, | 1194 | { PCI_DEVICE(0x1814, 0x5392) }, |