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

Commit 5cc86f28 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rt2870: add eFuse support 



rt3070:
* remove unused bEEPROMFile field from RTMP_ADAPTER

rt2870:
* propagate eFuse support from rt3070

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

drivers/staging/rt2860/common/eeprom.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -291,8 +291,7 @@ VOID RTMP_EEPROM_WRITE16( 
#endif

#endif

}

}





//2008/09/11:KH add to support efuse<--

#ifdef RT2870

#ifdef RT30xx

/*

/*

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

	========================================================================
@@ -1485,6 +1484,4 @@ NTSTATUS eFuseWriteRegistersFromBin( 




	return TRUE;

	return TRUE;

}

}



#endif
 
#endif // RT30xx //

//2008/09/11:KH add to support efuse-->

drivers/staging/rt2860/common/rtmp_init.c

+3 −7
Original line number Original line Diff line number Diff line
@@ -2186,10 +2186,8 @@ NDIS_STATUS NICInitializeAsic( 
	UINT32			MacCsr0 = 0;

	UINT32			MacCsr0 = 0;

	NTSTATUS		Status;

	NTSTATUS		Status;

	UCHAR			Value = 0xff;

	UCHAR			Value = 0xff;

#endif // RT2870 //

#ifdef RT30xx

	UINT32			eFuseCtrl;

	UINT32			eFuseCtrl;

#endif // RT30xx //

#endif

	USHORT			KeyIdx;

	USHORT			KeyIdx;

	INT				i,apidx;

	INT				i,apidx;
@@ -2501,8 +2499,7 @@ NDIS_STATUS NICInitializeAsic( 
	Counter&=0xffffff00;

	Counter&=0xffffff00;

	Counter|=0x000001e;

	Counter|=0x000001e;

	RTMP_IO_WRITE32(pAd, USB_CYC_CFG, Counter);

	RTMP_IO_WRITE32(pAd, USB_CYC_CFG, Counter);

#endif // RT2870 //



#ifdef RT30xx

	pAd->bUseEfuse=FALSE;

	pAd->bUseEfuse=FALSE;

	RTMP_IO_READ32(pAd, EFUSE_CTRL, &eFuseCtrl);

	RTMP_IO_READ32(pAd, EFUSE_CTRL, &eFuseCtrl);

	pAd->bUseEfuse = ( (eFuseCtrl & 0x80000000) == 0x80000000) ? 1 : 0;

	pAd->bUseEfuse = ( (eFuseCtrl & 0x80000000) == 0x80000000) ? 1 : 0;
@@ -2513,9 +2510,8 @@ NDIS_STATUS NICInitializeAsic( 
	else

	else

	{

	{

			DBGPRINT(RT_DEBUG_TRACE, ("NVM is EEPROM\n"));

			DBGPRINT(RT_DEBUG_TRACE, ("NVM is EEPROM\n"));



	}

	}

#endif // RT30xx //

#endif





	{

	{

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

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

drivers/staging/rt2860/rtmp.h

+2 −5
Original line number Original line Diff line number Diff line
@@ -2938,12 +2938,9 @@ typedef struct _RTMP_ADAPTER 




	UINT8					PM_FlgSuspend;

	UINT8					PM_FlgSuspend;





#ifdef RT30xx

#ifdef RT2870

//======efuse

	BOOLEAN		bUseEfuse;

	BOOLEAN		bUseEfuse;

	BOOLEAN		bEEPROMFile;

#endif

#endif // RT30xx //



} RTMP_ADAPTER, *PRTMP_ADAPTER;

} RTMP_ADAPTER, *PRTMP_ADAPTER;





//

//

drivers/staging/rt2860/sta_ioctl.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -229,13 +229,11 @@ static struct { 
    {"ForceGF",		        		Set_ForceGF_Proc},

    {"ForceGF",		        		Set_ForceGF_Proc},

	{"LongRetry",	        		Set_LongRetryLimit_Proc},

	{"LongRetry",	        		Set_LongRetryLimit_Proc},

	{"ShortRetry",	        		Set_ShortRetryLimit_Proc},

	{"ShortRetry",	        		Set_ShortRetryLimit_Proc},

//2008/09/11:KH add to support efuse<--

#ifdef RT2870

#ifdef RT30xx

	{"efuseFreeNumber",				set_eFuseGetFreeBlockCount_Proc},

	{"efuseFreeNumber",				set_eFuseGetFreeBlockCount_Proc},

	{"efuseDump",					set_eFusedump_Proc},

	{"efuseDump",					set_eFusedump_Proc},

	{"efuseLoadFromBin",				set_eFuseLoadFromBin_Proc},

	{"efuseLoadFromBin",				set_eFuseLoadFromBin_Proc},

#endif // RT30xx //

#endif

//2008/09/11:KH add to support efuse-->

	{NULL,}

	{NULL,}

};

};

drivers/staging/rt2870/common/rtusb_io.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -803,13 +803,9 @@ NTSTATUS RTUSBReadEEPROM( 
{

{

	NTSTATUS	Status = STATUS_SUCCESS;

	NTSTATUS	Status = STATUS_SUCCESS;





#ifdef RT30xx

	if(pAd->bUseEfuse)

	if(pAd->bUseEfuse)

	{

		Status =eFuseRead(pAd, Offset, pData, length);

		Status =eFuseRead(pAd, Offset, pData, length);

	}

	else

	else

#endif // RT30xx //

	{

	{

	Status = RTUSB_VendorRequest(

	Status = RTUSB_VendorRequest(

		pAd,

		pAd,
@@ -848,13 +844,9 @@ NTSTATUS RTUSBWriteEEPROM( 
{

{

	NTSTATUS	Status = STATUS_SUCCESS;

	NTSTATUS	Status = STATUS_SUCCESS;





#ifdef RT30xx

	if(pAd->bUseEfuse)

	if(pAd->bUseEfuse)

	{

		Status = eFuseWrite(pAd, Offset, pData, length);

		Status = eFuseWrite(pAd, Offset, pData, length);

	}

	else

	else

#endif // RT30xx //

	{

	{

	Status = RTUSB_VendorRequest(

	Status = RTUSB_VendorRequest(

		pAd,

		pAd,