diff options
| author | Michael Chan <mchan@broadcom.com> | 2007-02-13 12:17:38 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-02-13 12:17:38 -0800 |
| commit | d7b0a8573c9ac8923bf6f205f4ce60dd2ac811d5 (patch) | |
| tree | c787b47bdd597e8518f4ca25d2f2280f86a64401 /drivers | |
| parent | d4011adaf8b5ea555357a40388ee9aa7ed2daf9f (diff) | |
| download | op-kernel-dev-d7b0a8573c9ac8923bf6f205f4ce60dd2ac811d5.zip op-kernel-dev-d7b0a8573c9ac8923bf6f205f4ce60dd2ac811d5.tar.gz | |
[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')
| -rw-r--r-- | drivers/net/tg3.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index fc94b19..b6615f1 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))) { |
