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

Commit 9eeb783e authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rtxx70: merge rt3070 with rt2870 



* remove RT30xx ifdefs
* add -DRT3070 to rt2870's EXTRA_CFLAGS
* because of changes in the way that hardware is initialized/accessed
  rt3070 driver's firmware should be now also used by rt2870 driver
  (this is also done by newer out-of-tree vendor driver versions, i.e.
  2.1.0.0, historically in-kernel driver was based on 1.4.0.0 version)
* change RT28xx_CHIP_NAME to RTxx70
* update rt2870's help entry text
* add MODULE_ALIAS("rt3070sta") to rt2870
* update rt3070's dependencies

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 606661ea

drivers/staging/rt2860/common/cmm_info.c

+0 −11
Original line number Diff line number Diff line
@@ -1419,17 +1419,6 @@ VOID RTMPSetHT( 
		pAd->CommonCfg.DesiredHtPhy.RxSTBC = 0;

	}



#ifndef RT30xx

#ifdef RT2870

	/* Frank recommend ,If not, Tx maybe block in high power. Rx has no problem*/

	if(IS_RT3070(pAd) && ((pAd->RfIcType == RFIC_3020) || (pAd->RfIcType == RFIC_2020)))

	{

		pAd->CommonCfg.HtCapability.HtCapInfo.TxSTBC = 0;

		pAd->CommonCfg.DesiredHtPhy.TxSTBC = 0;

	}

#endif // RT2870 //

#endif



	if(pHTPhyMode->SHORTGI == GI_400)

	{

		pAd->CommonCfg.HtCapability.HtCapInfo.ShortGIfor20 = 1;

drivers/staging/rt2860/common/mlme.c

+7 −23
Original line number Diff line number Diff line
@@ -5565,8 +5565,7 @@ VOID AsicUpdateProtect( 
	}

}



#ifdef RT30xx

// add by johnli, RF power sequence setup

#ifdef RT2870

/*

	==========================================================================

	Description:
@@ -5721,8 +5720,7 @@ VOID RT30xxReverseRFSleepModeSetup( 
		RTMP_IO_WRITE32(pAd, LDO_CFG0, MACValue);

	}

}

// end johnli

#endif // RT30xx //

#endif



/*

	==========================================================================
@@ -5764,9 +5762,7 @@ VOID AsicSwitchChannel( 
#ifdef RT2870

	// The RF programming sequence is difference between 3xxx and 2xxx

	if ((IS_RT3070(pAd) || IS_RT3090(pAd)) && (

#ifdef RT30xx

	     (pAd->RfIcType == RFIC_3022) || (pAd->RfIcType == RFIC_3021) ||

#endif

	     (pAd->RfIcType == RFIC_3020) || (pAd->RfIcType == RFIC_2020)))

	{

		/* modify by WY for Read RF Reg. error */
@@ -5789,7 +5785,6 @@ VOID AsicSwitchChannel( 
				RFValue = (RFValue & 0xE0) | TxPwer;

				RT30xxWriteRFRegister(pAd, RF_R12, RFValue);



#ifdef RT30xx

				// Set Tx1 Power

				RT30xxReadRFRegister(pAd, RF_R13, &RFValue);

				RFValue = (RFValue & 0xE0) | TxPwer2;
@@ -5809,7 +5804,6 @@ VOID AsicSwitchChannel( 
				else if (pAd->Antenna.field.RxPath == 2)

					RFValue |= 0x40;

				RT30xxWriteRFRegister(pAd, RF_R01, RFValue);

#endif



				// Set RF offset

				RT30xxReadRFRegister(pAd, RF_R23, &RFValue);
@@ -5827,9 +5821,8 @@ VOID AsicSwitchChannel( 
					RFValue = pAd->Mlme.CaliBW20RfR24;

				}

				RT30xxWriteRFRegister(pAd, RF_R24, RFValue);

#ifdef RT30xx

				RT30xxWriteRFRegister(pAd, RF_R31, RFValue);

#endif



				// Enable RF tuning

				RT30xxReadRFRegister(pAd, RF_R07, &RFValue);

				RFValue = RFValue | 0x1;
@@ -5838,7 +5831,6 @@ VOID AsicSwitchChannel( 
				// latch channel for future usage.

				pAd->LatchRfRegs.Channel = Channel;



#ifdef RT30xx

				DBGPRINT(RT_DEBUG_TRACE, ("SwitchChannel#%d(RF=%d, Pwr0=%d, Pwr1=%d, %dT), N=0x%02X, K=0x%02X, R=0x%02X\n",

					Channel,

					pAd->RfIcType,
@@ -5848,8 +5840,6 @@ VOID AsicSwitchChannel( 
					FreqItems3020[index].N,

					FreqItems3020[index].K,

					FreqItems3020[index].R));

#endif



				break;

			}

		}
@@ -6828,13 +6818,13 @@ VOID AsicSetEdcaParm( 
				Ac2Cfg.field.AcTxop = 5;

			}



#ifdef RT30xx

#ifdef RT2870

			if (pAd->RfIcType == RFIC_3020 || pAd->RfIcType == RFIC_2020)

			{

				// Tuning for WiFi WMM S3-T07: connexant legacy sta ==> broadcom 11n sta.

				Ac2Cfg.field.Aifsn = 5;

			}

#endif // RT30xx //

#endif

		}



		Ac3Cfg.field.AcTxop = pEdcaParm->Txop[QID_AC_VO];
@@ -6915,11 +6905,10 @@ VOID AsicSetEdcaParm( 
		}



		AifsnCsr.field.Aifsn3 = Ac3Cfg.field.Aifsn - 1; //pEdcaParm->Aifsn[QID_AC_VO]; //for TGn wifi test

#ifdef RT30xx

#ifdef RT2870

		if (pAd->RfIcType == RFIC_3020 || pAd->RfIcType == RFIC_2020)

			AifsnCsr.field.Aifsn2 = 0x2; //pEdcaParm->Aifsn[QID_AC_VI]; //for WiFi WMM S4-T04.

#endif // RT30xx //



#endif

		RTMP_IO_WRITE32(pAd, WMM_AIFSN_CFG, AifsnCsr.word);



		NdisMoveMemory(&pAd->CommonCfg.APEdcaParm, pEdcaParm, sizeof(EDCA_PARM));
@@ -8493,12 +8482,7 @@ VOID AsicStaBbpTuning( 
#ifdef RT2870

			// RT3070 is a no LNA solution, it should have different control regarding to AGC gain control

			// Otherwise, it will have some throughput side effect when low RSSI

#ifndef RT30xx

			if (IS_RT3070(pAd))

#endif

#ifdef RT30xx

			if (IS_RT30xx(pAd))

#endif

			{

				if (Rssi > RSSI_FOR_MID_LOW_SENSIBILITY)

				{

drivers/staging/rt2860/common/rtmp_init.c

+16 −65
Original line number Diff line number Diff line
@@ -38,16 +38,12 @@ 
    Jan Lee  2006-09-15    RT2860. Change for 802.11n , EEPROM, Led, BA, HT.

*/

#include "../rt_config.h"

#ifndef RT30xx

#ifdef RT2860

#include "firmware.h"

#include <linux/bitrev.h>

#endif

#ifdef RT2870

#include "../../rt2870/common/firmware.h"

#endif

#endif

#ifdef RT30xx

/* New firmware handles both RT2870 and RT3070. */

#include "../../rt3070/firmware.h"

#endif
@@ -147,12 +143,7 @@ REG_PAIR RT30xx_RFRegTable[] = { 
        {RF_R06,          0x02},

        {RF_R07,          0x70},

        {RF_R09,          0x0F},

#ifndef RT30xx

        {RF_R10,          0x71},

#endif

#ifdef RT30xx

        {RF_R10,          0x41},

#endif

        {RF_R11,          0x21},

        {RF_R12,          0x7B},

        {RF_R14,          0x90},
@@ -165,9 +156,6 @@ REG_PAIR RT30xx_RFRegTable[] = { 
        {RF_R21,          0xDB},

        {RF_R24,          0x16},

        {RF_R25,          0x01},

#ifndef RT30xx

        {RF_R27,          0x03},

#endif

        {RF_R29,          0x1F},

};

#define	NUM_RF_REG_PARMS	(sizeof(RT30xx_RFRegTable) / sizeof(REG_PAIR))
@@ -1107,7 +1095,7 @@ VOID RTMPFilterCalibration( 
	UCHAR	RF_R24_Value = 0;



	// Give bbp filter initial value

#ifndef RT30xx

#ifndef RT2870

	pAd->Mlme.CaliBW20RfR24 = 0x16;

	pAd->Mlme.CaliBW40RfR24 = 0x36;  //Bit[5] must be 1 for BW 40

#else
@@ -1131,7 +1119,7 @@ VOID RTMPFilterCalibration( 
			BBPValue&= (~0x18);

			BBPValue|= (0x10);

			RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R4, BBPValue);

#ifdef RT30xx

#ifdef RT2870

			// set to BW40

			RT30xxReadRFRegister(pAd, RF_R31, &value);

			value |= 0x20;
@@ -1147,7 +1135,7 @@ VOID RTMPFilterCalibration( 
				FilterTarget = 0x13;

			else

				FilterTarget = 0x16;

#ifdef RT30xx

#ifdef RT2870

			// set to BW20

			RT30xxReadRFRegister(pAd, RF_R31, &value);

			value &= (~0x20);
@@ -1263,20 +1251,13 @@ VOID NICInitRT30xxRFRegisters(IN PRTMP_ADAPTER pAd) 
	INT i;

	// Driver must read EEPROM to get RfIcType before initial RF registers

	// Initialize RF register to default value

	if (IS_RT3070(pAd)

#ifdef RT30xx

	    || IS_RT3071(pAd)

#else

	    && (pAd->RfIcType == RFIC_3020 || pAd->RfIcType == RFIC_2020)

#endif

	   )

	if (IS_RT3070(pAd) || IS_RT3071(pAd))

	{

		// Init RF calibration

		// Driver should toggle RF R30 bit7 before init RF registers

		UINT32 RfReg = 0;

#ifdef RT30xx

		UINT32 data;

#endif



		RT30xxReadRFRegister(pAd, RF_R30, (PUCHAR)&RfReg);

		RfReg |= 0x80;

		RT30xxWriteRFRegister(pAd, RF_R30, (UCHAR)RfReg);
@@ -1290,7 +1271,6 @@ VOID NICInitRT30xxRFRegisters(IN PRTMP_ADAPTER pAd) 
			RT30xxWriteRFRegister(pAd, RT30xx_RFRegTable[i].Register, RT30xx_RFRegTable[i].Value);

		}



#ifdef RT30xx

		if (IS_RT3070(pAd))

		{

			//  Update MAC 0x05D4 from 01xxxxxx to 0Dxxxxxx (voltage 1.2V to 1.35V) for RT3070 to improve yield rate
@@ -1328,10 +1308,10 @@ VOID NICInitRT30xxRFRegisters(IN PRTMP_ADAPTER pAd) 
			data &= ~(0x20);

			RTUSBWriteMACRegister(pAd, GPIO_SWITCH, data);

		}

#endif



		//For RF filter Calibration

		RTMPFilterCalibration(pAd);

#ifdef RT30xx



		// Initialize RF R27 register, set RF R27 must be behind RTMPFilterCalibration()

		if ((pAd->MACVersion & 0xffff) < 0x0211)

			RT30xxWriteRFRegister(pAd, RF_R27, 0x3);
@@ -1346,7 +1326,6 @@ VOID NICInitRT30xxRFRegisters(IN PRTMP_ADAPTER pAd) 
			// add by johnli, RF power sequence setup, load RF normal operation-mode setup

			RT30xxLoadRFNormalModeSetup(pAd);

		}

#endif

	}

}

#endif // RT2870 //
@@ -1567,9 +1546,6 @@ VOID NICReadEEPROMParameters( 
	NicConfig2.word = pAd->EEPROMDefaultValue[1];



	{

#ifndef RT30xx

		NicConfig2.word = 0;

#endif

		if ((NicConfig2.word & 0x00ff) == 0xff)

		{

			NicConfig2.word &= 0xff00;
@@ -1806,10 +1782,9 @@ VOID NICInitAsicFromEEPROM( 
		}

	}



#ifndef RT30xx

#ifndef RT2870

	Antenna.word = pAd->Antenna.word;

#endif

#ifdef RT30xx

#else

	Antenna.word = pAd->EEPROMDefaultValue[0];

	if (Antenna.word == 0xFFFF)

	{
@@ -1820,7 +1795,7 @@ VOID NICInitAsicFromEEPROM( 
	pAd->Mlme.RealRxPath = (UCHAR) Antenna.field.RxPath;

	pAd->RfIcType = (UCHAR) Antenna.field.RfIcType;



#ifdef RT30xx

#ifdef RT2870

	DBGPRINT(RT_DEBUG_WARN, ("pAd->RfIcType = %d, RealRxPath=%d, TxPath = %d\n", pAd->RfIcType, pAd->Mlme.RealRxPath,Antenna.field.TxPath));



	// Save the antenna for future use
@@ -1828,7 +1803,7 @@ VOID NICInitAsicFromEEPROM( 
#endif

	NicConfig2.word = pAd->EEPROMDefaultValue[1];



#ifdef RT30xx

#ifdef RT2870

	{

		if ((NicConfig2.word & 0x00ff) == 0xff)

		{
@@ -1844,7 +1819,7 @@ VOID NICInitAsicFromEEPROM( 
	// Save the antenna for future use

	pAd->NicConfig2.word = NicConfig2.word;



#ifdef RT30xx

#ifdef RT2870

	// set default antenna as main

	if (pAd->RfIcType == RFIC_3020)

		AsicSetRxAnt(pAd, pAd->RxAnt.Pair1PrimaryRxAnt);
@@ -2251,21 +2226,8 @@ NDIS_STATUS NICInitializeAsic( 
#endif // RT3070 //

		RTMP_IO_WRITE32(pAd, (USHORT)MACRegTable[Index].Register, MACRegTable[Index].Value);

	}



#ifndef RT30xx

	if(IS_RT3070(pAd))

	{

		// According to Frank Hsu (from Gary Tsao)

		RTMP_IO_WRITE32(pAd, (USHORT)TX_SW_CFG0, 0x00000400);



		// Initialize RT3070 serial MAC registers which is different from RT2870 serial

		RTUSBWriteMACRegister(pAd, TX_SW_CFG1, 0);

		RTUSBWriteMACRegister(pAd, TX_SW_CFG2, 0);

	}

#endif

#endif // RT2870 //





	{

		for (Index = 0; Index < NUM_STA_MAC_REG_PARMS; Index++)

		{
@@ -2300,7 +2262,7 @@ NDIS_STATUS NICInitializeAsic( 
			RTMP_IO_WRITE32(pAd, TX_SW_CFG2, 0x0);

		}

	}

#ifdef RT30xx

#ifdef RT2870

	else if (IS_RT3070(pAd))

	{

		RTMP_IO_WRITE32(pAd, TX_SW_CFG1, 0);
@@ -2347,22 +2309,11 @@ NDIS_STATUS NICInitializeAsic( 
		RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBPRegTable[Index].Register, BBPRegTable[Index].Value);

	}



#ifndef RT30xx

#ifndef RT2870

	// for rt2860E and after, init BBP_R84 with 0x19. This is for extension channel overlapping IOT.

	if ((pAd->MACVersion&0xffff) != 0x0101)

		RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R84, 0x19);



#ifdef RT2870

	//write RT3070 BBP wchich different with 2870 after write RT2870 BBP

	if (IS_RT3070(pAd))

	{

		RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R70, 0x0a);

		RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R84, 0x99);

		RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R105, 0x05);

	}

#endif // RT2870 //

#endif

#ifdef RT30xx

#else

	// for rt2860E and after, init BBP_R84 with 0x19. This is for extension channel overlapping IOT.

	// RT3090 should not program BBP R84 to 0x19, otherwise TX will block.

	if (((pAd->MACVersion&0xffff) != 0x0101) && (!IS_RT30xx(pAd)))

drivers/staging/rt2860/rt_main_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -522,7 +522,7 @@ static int rt28xx_init(IN struct net_device *net_dev) 
	AsicSwitchChannel(pAd, pAd->CommonCfg.Channel, FALSE);

	AsicLockChannel(pAd, pAd->CommonCfg.Channel);



#ifndef RT30xx

#ifndef RT2870

	// 8051 firmware require the signal during booting time.

	AsicSendCommandToMcu(pAd, 0x72, 0xFF, 0x00, 0x00);

#endif

drivers/staging/rt2860/rtmp.h

+2 −2
Original line number Diff line number Diff line
@@ -391,14 +391,14 @@ typedef struct _QUEUE_HEADER { 
    (_idx) = (_idx+1) % (_RingSize);       \

}



#ifdef RT30xx

#ifdef RT2870

// We will have a cost down version which mac version is 0x3090xxxx

#define IS_RT3090(_pAd)				((((_pAd)->MACVersion & 0xffff0000) == 0x30710000) || (((_pAd)->MACVersion & 0xffff0000) == 0x30900000))

#else

#define IS_RT3090(_pAd)				0

#endif

#define IS_RT3070(_pAd)				(((_pAd)->MACVersion & 0xffff0000) == 0x30700000)

#ifdef RT30xx

#ifdef RT2870

#define IS_RT3071(_pAd)				(((_pAd)->MACVersion & 0xffff0000) == 0x30710000)

#define IS_RT30xx(_pAd)				(((_pAd)->MACVersion & 0xfff00000) == 0x30700000)

#endif