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

Commit 3b9b74ba authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

rt2800: add support for radio chip RF3070 



Add support for new RF chip ID: 3070. It seems to be the same as 5370,
maybe vendor just put wrong value on the eeprom, but add this id anyway
since devices with it showed on the marked.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 05f3820b

drivers/net/wireless/rt2x00/rt2800.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -52,6 +52,7 @@ 
 * RF3322 2.4G 2T2R(RT3352/RT3371/RT3372/RT3391/RT3392)

 * RF3322 2.4G 2T2R(RT3352/RT3371/RT3372/RT3391/RT3392)

 * RF3053 2.4G/5G 3T3R(RT3883/RT3563/RT3573/RT3593/RT3662)

 * RF3053 2.4G/5G 3T3R(RT3883/RT3563/RT3573/RT3593/RT3662)

 * RF5592 2.4G/5G 2T2R

 * RF5592 2.4G/5G 2T2R

 * RF3070 2.4G 1T1R

 * RF5360 2.4G 1T1R

 * RF5360 2.4G 1T1R

 * RF5370 2.4G 1T1R

 * RF5370 2.4G 1T1R

 * RF5390 2.4G 1T1R

 * RF5390 2.4G 1T1R
@@ -70,6 +71,7 @@ 
#define RF3322				0x000c

#define RF3322				0x000c

#define RF3053				0x000d

#define RF3053				0x000d

#define RF5592				0x000f

#define RF5592				0x000f

#define RF3070				0x3070

#define RF3290				0x3290

#define RF3290				0x3290

#define RF5360				0x5360

#define RF5360				0x5360

#define RF5370				0x5370

#define RF5370				0x5370

drivers/net/wireless/rt2x00/rt2800lib.c

+7 −1
Original line number Original line Diff line number Diff line
@@ -3152,6 +3152,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, 
	case RF3322:

	case RF3322:

		rt2800_config_channel_rf3322(rt2x00dev, conf, rf, info);

		rt2800_config_channel_rf3322(rt2x00dev, conf, rf, info);

		break;

		break;

	case RF3070:

	case RF5360:

	case RF5360:

	case RF5370:

	case RF5370:

	case RF5372:

	case RF5372:
@@ -3166,7 +3167,8 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, 
		rt2800_config_channel_rf2xxx(rt2x00dev, conf, rf, info);

		rt2800_config_channel_rf2xxx(rt2x00dev, conf, rf, info);

	}

	}





	if (rt2x00_rf(rt2x00dev, RF3290) ||

	if (rt2x00_rf(rt2x00dev, RF3070) ||

	    rt2x00_rf(rt2x00dev, RF3290) ||

	    rt2x00_rf(rt2x00dev, RF3322) ||

	    rt2x00_rf(rt2x00dev, RF3322) ||

	    rt2x00_rf(rt2x00dev, RF5360) ||

	    rt2x00_rf(rt2x00dev, RF5360) ||

	    rt2x00_rf(rt2x00dev, RF5370) ||

	    rt2x00_rf(rt2x00dev, RF5370) ||
@@ -4272,6 +4274,7 @@ void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev) 
		rt2800_rfcsr_write(rt2x00dev, 7, rfcsr);

		rt2800_rfcsr_write(rt2x00dev, 7, rfcsr);

		break;

		break;

	case RF3053:

	case RF3053:

	case RF3070:

	case RF3290:

	case RF3290:

	case RF5360:

	case RF5360:

	case RF5370:

	case RF5370:
@@ -7038,6 +7041,7 @@ static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev) 
	case RF3022:

	case RF3022:

	case RF3052:

	case RF3052:

	case RF3053:

	case RF3053:

	case RF3070:

	case RF3290:

	case RF3290:

	case RF3320:

	case RF3320:

	case RF3322:

	case RF3322:
@@ -7560,6 +7564,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) 
		   rt2x00_rf(rt2x00dev, RF2020) ||

		   rt2x00_rf(rt2x00dev, RF2020) ||

		   rt2x00_rf(rt2x00dev, RF3021) ||

		   rt2x00_rf(rt2x00dev, RF3021) ||

		   rt2x00_rf(rt2x00dev, RF3022) ||

		   rt2x00_rf(rt2x00dev, RF3022) ||

		   rt2x00_rf(rt2x00dev, RF3070) ||

		   rt2x00_rf(rt2x00dev, RF3290) ||

		   rt2x00_rf(rt2x00dev, RF3290) ||

		   rt2x00_rf(rt2x00dev, RF3320) ||

		   rt2x00_rf(rt2x00dev, RF3320) ||

		   rt2x00_rf(rt2x00dev, RF3322) ||

		   rt2x00_rf(rt2x00dev, RF3322) ||
@@ -7688,6 +7693,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) 
	case RF3320:

	case RF3320:

	case RF3052:

	case RF3052:

	case RF3053:

	case RF3053:

	case RF3070:

	case RF3290:

	case RF3290:

	case RF5360:

	case RF5360:

	case RF5370:

	case RF5370: