diff options
-rw-r--r-- | drivers/net/tg3.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index ed7a86df98cd..c5c3d2853144 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -1950,7 +1950,8 @@ static void tg3_frob_aux_power(struct tg3 *tp) | |||
1950 | GRC_LCLCTRL_GPIO_OUTPUT0 | | 1950 | GRC_LCLCTRL_GPIO_OUTPUT0 | |
1951 | GRC_LCLCTRL_GPIO_OUTPUT1), | 1951 | GRC_LCLCTRL_GPIO_OUTPUT1), |
1952 | 100); | 1952 | 100); |
1953 | } else if (tp->pdev->device == PCI_DEVICE_ID_TIGON3_5761) { | 1953 | } else if (tp->pdev->device == PCI_DEVICE_ID_TIGON3_5761 || |
1954 | tp->pdev->device == TG3PCI_DEVICE_TIGON3_5761S) { | ||
1954 | /* The 5761 non-e device swaps GPIO 0 and GPIO 2. */ | 1955 | /* The 5761 non-e device swaps GPIO 0 and GPIO 2. */ |
1955 | u32 grc_local_ctrl = GRC_LCLCTRL_GPIO_OE0 | | 1956 | u32 grc_local_ctrl = GRC_LCLCTRL_GPIO_OE0 | |
1956 | GRC_LCLCTRL_GPIO_OE1 | | 1957 | GRC_LCLCTRL_GPIO_OE1 | |
@@ -12183,7 +12184,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) | |||
12183 | GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780) | 12184 | GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780) |
12184 | tp->grc_local_ctrl |= GRC_LCLCTRL_GPIO_UART_SEL; | 12185 | tp->grc_local_ctrl |= GRC_LCLCTRL_GPIO_UART_SEL; |
12185 | 12186 | ||
12186 | if (tp->pdev->device == PCI_DEVICE_ID_TIGON3_5761) { | 12187 | if (tp->pdev->device == PCI_DEVICE_ID_TIGON3_5761 || |
12188 | tp->pdev->device == TG3PCI_DEVICE_TIGON3_5761S) { | ||
12187 | /* Turn off the debug UART. */ | 12189 | /* Turn off the debug UART. */ |
12188 | tp->grc_local_ctrl |= GRC_LCLCTRL_GPIO_UART_SEL; | 12190 | tp->grc_local_ctrl |= GRC_LCLCTRL_GPIO_UART_SEL; |
12189 | if (tp->tg3_flags2 & TG3_FLG2_IS_NIC) | 12191 | if (tp->tg3_flags2 & TG3_FLG2_IS_NIC) |