openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

rt2x00: Remove RT2870 chipset identification. 

There is no evidence, either in adapters or in the Ralink code, that such
a device actually exists. All so-call RT2870 adapter identify themselves
as RT2860.

Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
This commit is contained in:
Gertjan van Wingerde 2010-06-03 10:51:57 +02:00 committed by Ivo van Doorn
parent f0194b2d5d
commit 5ed8f4582a
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/wireless/rt2x00/rt2800.h
View File

@ -63,7 +63,6 @@
*/ */
#define REV_RT2860C 0x0100 #define REV_RT2860C 0x0100
#define REV_RT2860D 0x0101 #define REV_RT2860D 0x0101
#define REV_RT2870D 0x0101
#define REV_RT2872E 0x0200 #define REV_RT2872E 0x0200
#define REV_RT3070E 0x0200 #define REV_RT3070E 0x0200
#define REV_RT3070F 0x0201 #define REV_RT3070F 0x0201

5
drivers/net/wireless/rt2x00/rt2800lib.c
View File

@ -1766,8 +1766,7 @@ int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
rt2800_bbp_write(rt2x00dev, 82, 0x62); rt2800_bbp_write(rt2x00dev, 82, 0x62);
rt2800_bbp_write(rt2x00dev, 83, 0x6a); rt2800_bbp_write(rt2x00dev, 83, 0x6a);
if (rt2x00_rt_rev(rt2x00dev, RT2860, REV_RT2860D) || if (rt2x00_rt_rev(rt2x00dev, RT2860, REV_RT2860D))
rt2x00_rt_rev(rt2x00dev, RT2870, REV_RT2870D))
rt2800_bbp_write(rt2x00dev, 84, 0x19); rt2800_bbp_write(rt2x00dev, 84, 0x19);
else else
rt2800_bbp_write(rt2x00dev, 84, 0x99); rt2800_bbp_write(rt2x00dev, 84, 0x99);
@ -2207,7 +2206,6 @@ int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev)
rt2x00_eeprom_write(rt2x00dev, EEPROM_ANTENNA, word); rt2x00_eeprom_write(rt2x00dev, EEPROM_ANTENNA, word);
EEPROM(rt2x00dev, "Antenna: 0x%04x\n", word); EEPROM(rt2x00dev, "Antenna: 0x%04x\n", word);
} else if (rt2x00_rt(rt2x00dev, RT2860) || } else if (rt2x00_rt(rt2x00dev, RT2860) ||
rt2x00_rt(rt2x00dev, RT2870) ||
rt2x00_rt(rt2x00dev, RT2872)) { rt2x00_rt(rt2x00dev, RT2872)) {
/* /*
* There is a max of 2 RX streams for RT28x0 series * There is a max of 2 RX streams for RT28x0 series
@ -2311,7 +2309,6 @@ int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
value, rt2x00_get_field32(reg, MAC_CSR0_REVISION)); value, rt2x00_get_field32(reg, MAC_CSR0_REVISION));
if (!rt2x00_rt(rt2x00dev, RT2860) && if (!rt2x00_rt(rt2x00dev, RT2860) &&
!rt2x00_rt(rt2x00dev, RT2870) &&
!rt2x00_rt(rt2x00dev, RT2872) && !rt2x00_rt(rt2x00dev, RT2872) &&
!rt2x00_rt(rt2x00dev, RT2883) && !rt2x00_rt(rt2x00dev, RT2883) &&
!rt2x00_rt(rt2x00dev, RT3070) && !rt2x00_rt(rt2x00dev, RT3070) &&

3
drivers/net/wireless/rt2x00/rt2x00.h
View File

@ -176,8 +176,7 @@ struct rt2x00_chip {
#define RT2570 0x2570 #define RT2570 0x2570
#define RT2661 0x2661 #define RT2661 0x2661
#define RT2573 0x2573 #define RT2573 0x2573
#define RT2860 0x2860 /* 2.4GHz PCI/CB */ #define RT2860 0x2860 /* 2.4GHz */
#define RT2870 0x2870
#define RT2872 0x2872 /* WSOC */ #define RT2872 0x2872 /* WSOC */
#define RT2883 0x2883 /* WSOC */ #define RT2883 0x2883 /* WSOC */
#define RT3070 0x3070 #define RT3070 0x3070