aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2800lib.c
diff options
context:
space:
mode:
authorGertjan van Wingerde <gwingerde@gmail.com>2010-06-03 04:51:57 -0400
committerIvo van Doorn <IvDoorn@gmail.com>2010-06-03 04:51:57 -0400
commit5ed8f4582ae70cea53a86196411bd675e28e6a76 (patch)
treedb53837beb699e37a10d3ec89ce52f23dff598c4 /drivers/net/wireless/rt2x00/rt2800lib.c
parentf0194b2d5d01b99555fd8a6e42281809086f1ab1 (diff)
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>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2800lib.c')
-rw-r--r--drivers/net/wireless/rt2x00/rt2800lib.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 1556e324cec..1bf973475f1 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -1766,8 +1766,7 @@ int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
1766 rt2800_bbp_write(rt2x00dev, 82, 0x62); 1766 rt2800_bbp_write(rt2x00dev, 82, 0x62);
1767 rt2800_bbp_write(rt2x00dev, 83, 0x6a); 1767 rt2800_bbp_write(rt2x00dev, 83, 0x6a);
1768 1768
1769 if (rt2x00_rt_rev(rt2x00dev, RT2860, REV_RT2860D) || 1769 if (rt2x00_rt_rev(rt2x00dev, RT2860, REV_RT2860D))
1770 rt2x00_rt_rev(rt2x00dev, RT2870, REV_RT2870D))
1771 rt2800_bbp_write(rt2x00dev, 84, 0x19); 1770 rt2800_bbp_write(rt2x00dev, 84, 0x19);
1772 else 1771 else
1773 rt2800_bbp_write(rt2x00dev, 84, 0x99); 1772 rt2800_bbp_write(rt2x00dev, 84, 0x99);
@@ -2207,7 +2206,6 @@ int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev)
2207 rt2x00_eeprom_write(rt2x00dev, EEPROM_ANTENNA, word); 2206 rt2x00_eeprom_write(rt2x00dev, EEPROM_ANTENNA, word);
2208 EEPROM(rt2x00dev, "Antenna: 0x%04x\n", word); 2207 EEPROM(rt2x00dev, "Antenna: 0x%04x\n", word);
2209 } else if (rt2x00_rt(rt2x00dev, RT2860) || 2208 } else if (rt2x00_rt(rt2x00dev, RT2860) ||
2210 rt2x00_rt(rt2x00dev, RT2870) ||
2211 rt2x00_rt(rt2x00dev, RT2872)) { 2209 rt2x00_rt(rt2x00dev, RT2872)) {
2212 /* 2210 /*
2213 * There is a max of 2 RX streams for RT28x0 series 2211 * There is a max of 2 RX streams for RT28x0 series
@@ -2311,7 +2309,6 @@ int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
2311 value, rt2x00_get_field32(reg, MAC_CSR0_REVISION)); 2309 value, rt2x00_get_field32(reg, MAC_CSR0_REVISION));
2312 2310
2313 if (!rt2x00_rt(rt2x00dev, RT2860) && 2311 if (!rt2x00_rt(rt2x00dev, RT2860) &&
2314 !rt2x00_rt(rt2x00dev, RT2870) &&
2315 !rt2x00_rt(rt2x00dev, RT2872) && 2312 !rt2x00_rt(rt2x00dev, RT2872) &&
2316 !rt2x00_rt(rt2x00dev, RT2883) && 2313 !rt2x00_rt(rt2x00dev, RT2883) &&
2317 !rt2x00_rt(rt2x00dev, RT3070) && 2314 !rt2x00_rt(rt2x00dev, RT3070) &&