Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ed8f458 authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by Ivo van Doorn
Browse files

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: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
parent f0194b2d

drivers/net/wireless/rt2x00/rt2800.h

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ 
 */

#define REV_RT2860C			0x0100

#define REV_RT2860D			0x0101

#define REV_RT2870D			0x0101

#define REV_RT2872E			0x0200

#define REV_RT3070E			0x0200

#define REV_RT3070F			0x0201

drivers/net/wireless/rt2x00/rt2800lib.c

+1 −4
Original line number Diff line number Diff line
@@ -1766,8 +1766,7 @@ int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev) 
	rt2800_bbp_write(rt2x00dev, 82, 0x62);

	rt2800_bbp_write(rt2x00dev, 83, 0x6a);



	if (rt2x00_rt_rev(rt2x00dev, RT2860, REV_RT2860D) ||

	    rt2x00_rt_rev(rt2x00dev, RT2870, REV_RT2870D))

	if (rt2x00_rt_rev(rt2x00dev, RT2860, REV_RT2860D))

		rt2800_bbp_write(rt2x00dev, 84, 0x19);

	else

		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);

		EEPROM(rt2x00dev, "Antenna: 0x%04x\n", word);

	} else if (rt2x00_rt(rt2x00dev, RT2860) ||

		   rt2x00_rt(rt2x00dev, RT2870) ||

		   rt2x00_rt(rt2x00dev, RT2872)) {

		/*

		 * 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));



	if (!rt2x00_rt(rt2x00dev, RT2860) &&

	    !rt2x00_rt(rt2x00dev, RT2870) &&

	    !rt2x00_rt(rt2x00dev, RT2872) &&

	    !rt2x00_rt(rt2x00dev, RT2883) &&

	    !rt2x00_rt(rt2x00dev, RT3070) &&

drivers/net/wireless/rt2x00/rt2x00.h

+1 −2
Original line number Diff line number Diff line
@@ -176,8 +176,7 @@ struct rt2x00_chip { 
#define RT2570		0x2570

#define RT2661		0x2661

#define RT2573		0x2573

#define RT2860		0x2860	/* 2.4GHz PCI/CB */

#define RT2870		0x2870

#define RT2860		0x2860	/* 2.4GHz */

#define RT2872		0x2872	/* WSOC */

#define RT2883		0x2883	/* WSOC */

#define RT3070		0x3070