aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tg3.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r--drivers/net/tg3.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index a4d0d61d6af0..a94631af21cd 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -5353,6 +5353,11 @@ static int tg3_reset_hw(struct tg3 *tp)
5353 5353
5354 gpio_mask = GRC_LCLCTRL_GPIO_OE0 | GRC_LCLCTRL_GPIO_OE2 | 5354 gpio_mask = GRC_LCLCTRL_GPIO_OE0 | GRC_LCLCTRL_GPIO_OE2 |
5355 GRC_LCLCTRL_GPIO_OUTPUT0 | GRC_LCLCTRL_GPIO_OUTPUT2; 5355 GRC_LCLCTRL_GPIO_OUTPUT0 | GRC_LCLCTRL_GPIO_OUTPUT2;
5356
5357 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752)
5358 gpio_mask |= GRC_LCLCTRL_GPIO_OE3 |
5359 GRC_LCLCTRL_GPIO_OUTPUT3;
5360
5356 tp->grc_local_ctrl |= tr32(GRC_LOCAL_CTRL) & gpio_mask; 5361 tp->grc_local_ctrl |= tr32(GRC_LOCAL_CTRL) & gpio_mask;
5357 5362
5358 /* GPIO1 must be driven high for eeprom write protect */ 5363 /* GPIO1 must be driven high for eeprom write protect */
@@ -8077,6 +8082,11 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
8077 (tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT)) 8082 (tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT))
8078 tp->grc_local_ctrl |= (GRC_LCLCTRL_GPIO_OE1 | 8083 tp->grc_local_ctrl |= (GRC_LCLCTRL_GPIO_OE1 |
8079 GRC_LCLCTRL_GPIO_OUTPUT1); 8084 GRC_LCLCTRL_GPIO_OUTPUT1);
8085 /* Unused GPIO3 must be driven as output on 5752 because there
8086 * are no pull-up resistors on unused GPIO pins.
8087 */
8088 else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752)
8089 tp->grc_local_ctrl |= GRC_LCLCTRL_GPIO_OE3;
8080 8090
8081 /* Force the chip into D0. */ 8091 /* Force the chip into D0. */
8082 err = tg3_set_power_state(tp, 0); 8092 err = tg3_set_power_state(tp, 0);