tg3: Bypass power source switching for 57765
authorMatt Carlson <mcarlson@broadcom.com>
Wed, 20 Jan 2010 16:58:10 +0000 (16:58 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 21 Jan 2010 03:21:02 +0000 (19:21 -0800)
The 57765 repurposes all the GPIOs normally used to switch power sources
when configured as a NIC device.  This patch changes the code to avoid
touching the GPIOs for this asic rev.

Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Reviewed-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/tg3.c

index 075d21a6b55a4714246f936779ef2dccb90e6040..78102023aa93ed360428670a0af2c762613ff86f 100644 (file)
@@ -2021,7 +2021,9 @@ static void tg3_frob_aux_power(struct tg3 *tp)
 {
        struct tg3 *tp_peer = tp;
 
-       if ((tp->tg3_flags2 & TG3_FLG2_IS_NIC) == 0)
+       /* The GPIOs do something completely different on 57765. */
+       if ((tp->tg3_flags2 & TG3_FLG2_IS_NIC) == 0 ||
+           GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765)
                return;
 
        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 ||