Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d519ab2 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Allow 5761 WOL and LED fixes to 5761S too 



The 5761 WOL and LED fixes used the PCI device ID to as the activation
key.  The 5761S requires the same process.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 33466d93

drivers/net/tg3.c

+4 −2
Original line number Diff line number Diff line
@@ -1950,7 +1950,8 @@ static void tg3_frob_aux_power(struct tg3 *tp) 
				     GRC_LCLCTRL_GPIO_OUTPUT0 |

				     GRC_LCLCTRL_GPIO_OUTPUT1),

				    100);

		} else if (tp->pdev->device == PCI_DEVICE_ID_TIGON3_5761) {

		} else if (tp->pdev->device == PCI_DEVICE_ID_TIGON3_5761 ||

			   tp->pdev->device == TG3PCI_DEVICE_TIGON3_5761S) {

			/* The 5761 non-e device swaps GPIO 0 and GPIO 2. */

			u32 grc_local_ctrl = GRC_LCLCTRL_GPIO_OE0 |

					     GRC_LCLCTRL_GPIO_OE1 |
@@ -12183,7 +12184,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 
	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780)

		tp->grc_local_ctrl |= GRC_LCLCTRL_GPIO_UART_SEL;



	if (tp->pdev->device == PCI_DEVICE_ID_TIGON3_5761) {

	if (tp->pdev->device == PCI_DEVICE_ID_TIGON3_5761 ||

	    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5761S) {

		/* Turn off the debug UART. */

		tp->grc_local_ctrl |= GRC_LCLCTRL_GPIO_UART_SEL;

		if (tp->tg3_flags2 & TG3_FLG2_IS_NIC)