diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-06 16:59:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-06 16:59:55 -0700 |
| commit | ef130126cc8794f748d7513735ecb4d3d99fa39e (patch) | |
| tree | be4d1ba5fbea1d83570d50d8be6ce92a07496d31 | |
| parent | 5065cc02ccf9212d31ecb7fcd63d734e242e64b1 (diff) | |
| parent | 15def7bfb6902aa2b2bc67059f26d696fb27c235 (diff) | |
| download | blackbird-op-linux-ef130126cc8794f748d7513735ecb4d3d99fa39e.tar.gz blackbird-op-linux-ef130126cc8794f748d7513735ecb4d3d99fa39e.zip | |
Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/tg3-2.6
| -rw-r--r-- | drivers/net/tg3.c | 21 | ||||
| -rw-r--r-- | drivers/pci/pci.ids | 1 |
2 files changed, 19 insertions, 3 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index fc9b5cd957aa..e944aac258e3 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -7,7 +7,12 @@ * Copyright (C) 2005 Broadcom Corporation. * * Firmware is: - * Copyright (C) 2000-2003 Broadcom Corporation. + * Derived from proprietary unpublished source code, + * Copyright (C) 2000-2003 Broadcom Corporation. + * + * Permission is hereby granted for the distribution of this firmware + * data in hexadecimal or equivalent format, provided this copyright + * notice is accompanying it. */ #include <linux/config.h> @@ -61,8 +66,8 @@ #define DRV_MODULE_NAME "tg3" #define PFX DRV_MODULE_NAME ": " -#define DRV_MODULE_VERSION "3.29" -#define DRV_MODULE_RELDATE "May 23, 2005" +#define DRV_MODULE_VERSION "3.30" +#define DRV_MODULE_RELDATE "June 6, 2005" #define TG3_DEF_MAC_MODE 0 #define TG3_DEF_RX_MODE 0 @@ -8555,6 +8560,16 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp) case NIC_SRAM_DATA_CFG_LED_MODE_MAC: tp->led_ctrl = LED_CTRL_MODE_MAC; + + /* Default to PHY_1_MODE if 0 (MAC_MODE) is + * read on some older 5700/5701 bootcode. + */ + if (GET_ASIC_REV(tp->pci_chip_rev_id) == + ASIC_REV_5700 || + GET_ASIC_REV(tp->pci_chip_rev_id) == + ASIC_REV_5701) + tp->led_ctrl = LED_CTRL_MODE_PHY_1; + break; case SHASTA_EXT_LED_SHARED: diff --git a/drivers/pci/pci.ids b/drivers/pci/pci.ids index 93481b41b613..1d2ef1e2ffc6 100644 --- a/drivers/pci/pci.ids +++ b/drivers/pci/pci.ids @@ -7173,6 +7173,7 @@ 080f Sentry5 DDR/SDR RAM Controller 0811 Sentry5 External Interface Core 0816 BCM3302 Sentry5 MIPS32 CPU + 1600 NetXtreme BCM5752 Gigabit Ethernet PCI Express 1644 NetXtreme BCM5700 Gigabit Ethernet 1014 0277 Broadcom Vigil B5700 1000Base-T 1028 00d1 Broadcom BCM5700 |
