projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d4011ad
)
[TG3]: 5906 doesn't need to switch to slower clock.
author
Michael Chan
<
[email protected]
>
Tue, 13 Feb 2007 20:17:38 +0000
(12:17 -0800)
committer
David S. Miller
<
[email protected]
>
Tue, 13 Feb 2007 20:17:38 +0000
(12:17 -0800)
Signed-off-by: Michael Chan <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/tg3.c
patch
|
blob
|
history
diff --git
a/drivers/net/tg3.c
b/drivers/net/tg3.c
index fc94b19d1e28d6ad7764afa438cdca4a5493ed55..b6615f112eaa0b614d200df4ba8274a7b4563b27 100644
(file)
--- 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))) {