summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2007-02-13 21:17:38 +0100
committerDavid S. Miller <davem@davemloft.net>2007-02-13 21:17:38 +0100
commitd7b0a8573c9ac8923bf6f205f4ce60dd2ac811d5 (patch)
treec787b47bdd597e8518f4ca25d2f2280f86a64401 /drivers/net
parent[TG3]: 5722/5756 don't need PHY jitter workaround. (diff)
downloadlinux-d7b0a8573c9ac8923bf6f205f4ce60dd2ac811d5.tar.xz
linux-d7b0a8573c9ac8923bf6f205f4ce60dd2ac811d5.zip
[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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/tg3.c3
1 files changed, 2 insertions, 1 deletions
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))) {