From: Michael Chan <mchan@broadcom.com>
Date: Tue, 13 Feb 2007 20:17:38 +0000 (-0800)
Subject: [TG3]: 5906 doesn't need to switch to slower clock.
X-Git-Tag: MMI-PSA29.97-13-9~45297^2~2^2~12
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d7b0a8573c9ac8923bf6f205f4ce60dd2ac811d5;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

[TG3]: 5906 doesn't need to switch to slower clock.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index fc94b19d1e28..b6615f112eaa 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -1340,7 +1340,8 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
 
 		tw32_wait_f(TG3PCI_CLOCK_CTRL, base_val | CLOCK_CTRL_ALTCLK |
 			    CLOCK_CTRL_PWRDOWN_PLL133, 40);
-	} else if (tp->tg3_flags2 & TG3_FLG2_5780_CLASS) {
+	} else if ((tp->tg3_flags2 & TG3_FLG2_5780_CLASS) ||
+		   (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)) {
 		/* do nothing */
 	} else if (!((tp->tg3_flags2 & TG3_FLG2_5750_PLUS) &&
 		     (tp->tg3_flags & TG3_FLAG_ENABLE_ASF))) {