Commit 70b65a2d authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

[TG3]: Add missing NVRAM strapping. 



This patch adds a missing NVRAM strapping for 5755 devices.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9ef8ca99

drivers/net/tg3.c

+3 −1
Original line number Diff line number Diff line
@@ -9461,11 +9461,13 @@ static void __devinit tg3_get_5755_nvram_info(struct tg3 *tp) 
		case FLASH_5755VENDOR_ATMEL_FLASH_1:

		case FLASH_5755VENDOR_ATMEL_FLASH_2:

		case FLASH_5755VENDOR_ATMEL_FLASH_3:

		case FLASH_5755VENDOR_ATMEL_FLASH_5:

			tp->nvram_jedecnum = JEDEC_ATMEL;

			tp->tg3_flags |= TG3_FLAG_NVRAM_BUFFERED;

			tp->tg3_flags2 |= TG3_FLG2_FLASH;

			tp->nvram_pagesize = 264;

			if (nvcfg1 == FLASH_5755VENDOR_ATMEL_FLASH_1)

			if (nvcfg1 == FLASH_5755VENDOR_ATMEL_FLASH_1 ||

			    nvcfg1 == FLASH_5755VENDOR_ATMEL_FLASH_5)

				tp->nvram_size = (protect ? 0x3e200 : 0x80000);

			else if (nvcfg1 == FLASH_5755VENDOR_ATMEL_FLASH_2)

				tp->nvram_size = (protect ? 0x1f200 : 0x40000);

drivers/net/tg3.h

+1 −0
Original line number Diff line number Diff line
@@ -1467,6 +1467,7 @@ 
#define  FLASH_5755VENDOR_ATMEL_FLASH_2	 0x03400002

#define  FLASH_5755VENDOR_ATMEL_FLASH_3	 0x03400000

#define  FLASH_5755VENDOR_ATMEL_FLASH_4	 0x00000003

#define  FLASH_5755VENDOR_ATMEL_FLASH_5	 0x02000003

#define  FLASH_5755VENDOR_ATMEL_EEPROM_64KHZ	 0x03c00003

#define  FLASH_5755VENDOR_ATMEL_EEPROM_376KHZ	 0x03c00002

#define  FLASH_5787VENDOR_ATMEL_EEPROM_64KHZ	 0x03000003