diff options
author | Matt Carlson <mcarlson@broadcom.com> | 2008-05-02 19:48:36 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-05-02 19:48:36 -0400 |
commit | fd1122a2593d0bbe19856e3943c859ebfe563583 (patch) | |
tree | 75be50b8a959ef7f772612643d5d60104e9ccceb /drivers/net/tg3.h | |
parent | 8ef214288622bf523a3b3096958292a1c63132ad (diff) |
tg3: Fix 5761 NVRAM sizes
The 5761 NVRAM sizes assigned to the nvram_size member are half as big
as they should be. This patch corrects the NVRAM sizes and replaces
the hardcoded constants with preprocessor constants for readability.
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/tg3.h')
-rw-r--r-- | drivers/net/tg3.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index ce2be3a96175..bf387ff9bc15 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h | |||
@@ -2576,6 +2576,13 @@ struct tg3 { | |||
2576 | 2576 | ||
2577 | int nvram_lock_cnt; | 2577 | int nvram_lock_cnt; |
2578 | u32 nvram_size; | 2578 | u32 nvram_size; |
2579 | #define TG3_NVRAM_SIZE_64KB 0x00010000 | ||
2580 | #define TG3_NVRAM_SIZE_128KB 0x00020000 | ||
2581 | #define TG3_NVRAM_SIZE_256KB 0x00040000 | ||
2582 | #define TG3_NVRAM_SIZE_512KB 0x00080000 | ||
2583 | #define TG3_NVRAM_SIZE_1MB 0x00100000 | ||
2584 | #define TG3_NVRAM_SIZE_2MB 0x00200000 | ||
2585 | |||
2579 | u32 nvram_pagesize; | 2586 | u32 nvram_pagesize; |
2580 | u32 nvram_jedecnum; | 2587 | u32 nvram_jedecnum; |
2581 | 2588 | ||
@@ -2584,10 +2591,10 @@ struct tg3 { | |||
2584 | #define JEDEC_SAIFUN 0x4f | 2591 | #define JEDEC_SAIFUN 0x4f |
2585 | #define JEDEC_SST 0xbf | 2592 | #define JEDEC_SST 0xbf |
2586 | 2593 | ||
2587 | #define ATMEL_AT24C64_CHIP_SIZE (64 * 1024) | 2594 | #define ATMEL_AT24C64_CHIP_SIZE TG3_NVRAM_SIZE_64KB |
2588 | #define ATMEL_AT24C64_PAGE_SIZE (32) | 2595 | #define ATMEL_AT24C64_PAGE_SIZE (32) |
2589 | 2596 | ||
2590 | #define ATMEL_AT24C512_CHIP_SIZE (512 * 1024) | 2597 | #define ATMEL_AT24C512_CHIP_SIZE TG3_NVRAM_SIZE_512KB |
2591 | #define ATMEL_AT24C512_PAGE_SIZE (128) | 2598 | #define ATMEL_AT24C512_PAGE_SIZE (128) |
2592 | 2599 | ||
2593 | #define ATMEL_AT45DB0X1B_PAGE_POS 9 | 2600 | #define ATMEL_AT45DB0X1B_PAGE_POS 9 |