diff options
author | Matt Carlson <mcarlson@broadcom.com> | 2007-07-11 22:48:50 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-07-11 22:48:50 -0400 |
commit | 70b65a2d628d2e66bbf044bb764be64949f3580c (patch) | |
tree | 15f39fbf9e6b216bf8d4e1f961a54deb5203ac29 /drivers/net | |
parent | 9ef8ca99749784644602535691f8cf201ee2a225 (diff) |
[TG3]: Add missing NVRAM strapping.
This patch adds a missing NVRAM strapping for 5755 devices.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/tg3.c | 4 | ||||
-rw-r--r-- | drivers/net/tg3.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 4f59e5c10c46..0d40f9d67848 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -9461,11 +9461,13 @@ static void __devinit tg3_get_5755_nvram_info(struct tg3 *tp) | |||
9461 | case FLASH_5755VENDOR_ATMEL_FLASH_1: | 9461 | case FLASH_5755VENDOR_ATMEL_FLASH_1: |
9462 | case FLASH_5755VENDOR_ATMEL_FLASH_2: | 9462 | case FLASH_5755VENDOR_ATMEL_FLASH_2: |
9463 | case FLASH_5755VENDOR_ATMEL_FLASH_3: | 9463 | case FLASH_5755VENDOR_ATMEL_FLASH_3: |
9464 | case FLASH_5755VENDOR_ATMEL_FLASH_5: | ||
9464 | tp->nvram_jedecnum = JEDEC_ATMEL; | 9465 | tp->nvram_jedecnum = JEDEC_ATMEL; |
9465 | tp->tg3_flags |= TG3_FLAG_NVRAM_BUFFERED; | 9466 | tp->tg3_flags |= TG3_FLAG_NVRAM_BUFFERED; |
9466 | tp->tg3_flags2 |= TG3_FLG2_FLASH; | 9467 | tp->tg3_flags2 |= TG3_FLG2_FLASH; |
9467 | tp->nvram_pagesize = 264; | 9468 | tp->nvram_pagesize = 264; |
9468 | if (nvcfg1 == FLASH_5755VENDOR_ATMEL_FLASH_1) | 9469 | if (nvcfg1 == FLASH_5755VENDOR_ATMEL_FLASH_1 || |
9470 | nvcfg1 == FLASH_5755VENDOR_ATMEL_FLASH_5) | ||
9469 | tp->nvram_size = (protect ? 0x3e200 : 0x80000); | 9471 | tp->nvram_size = (protect ? 0x3e200 : 0x80000); |
9470 | else if (nvcfg1 == FLASH_5755VENDOR_ATMEL_FLASH_2) | 9472 | else if (nvcfg1 == FLASH_5755VENDOR_ATMEL_FLASH_2) |
9471 | tp->nvram_size = (protect ? 0x1f200 : 0x40000); | 9473 | tp->nvram_size = (protect ? 0x1f200 : 0x40000); |
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index e1b9381d3b41..d84e75e7365d 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h | |||
@@ -1467,6 +1467,7 @@ | |||
1467 | #define FLASH_5755VENDOR_ATMEL_FLASH_2 0x03400002 | 1467 | #define FLASH_5755VENDOR_ATMEL_FLASH_2 0x03400002 |
1468 | #define FLASH_5755VENDOR_ATMEL_FLASH_3 0x03400000 | 1468 | #define FLASH_5755VENDOR_ATMEL_FLASH_3 0x03400000 |
1469 | #define FLASH_5755VENDOR_ATMEL_FLASH_4 0x00000003 | 1469 | #define FLASH_5755VENDOR_ATMEL_FLASH_4 0x00000003 |
1470 | #define FLASH_5755VENDOR_ATMEL_FLASH_5 0x02000003 | ||
1470 | #define FLASH_5755VENDOR_ATMEL_EEPROM_64KHZ 0x03c00003 | 1471 | #define FLASH_5755VENDOR_ATMEL_EEPROM_64KHZ 0x03c00003 |
1471 | #define FLASH_5755VENDOR_ATMEL_EEPROM_376KHZ 0x03c00002 | 1472 | #define FLASH_5755VENDOR_ATMEL_EEPROM_376KHZ 0x03c00002 |
1472 | #define FLASH_5787VENDOR_ATMEL_EEPROM_64KHZ 0x03000003 | 1473 | #define FLASH_5787VENDOR_ATMEL_EEPROM_64KHZ 0x03000003 |