diff options
| author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-04-07 16:42:08 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-04-13 13:47:02 -0700 |
| commit | 22fb81eeb181ca53989b94fc480ac1ab1f61fe5d (patch) | |
| tree | cbc04b63b50b84c33fb7711e97ef5d7371240fdc | |
| parent | 6f13df7937b163572c588fb4486df27d6de02f5f (diff) | |
| download | kernel-common-22fb81eeb181ca53989b94fc480ac1ab1f61fe5d.tar.gz kernel-common-22fb81eeb181ca53989b94fc480ac1ab1f61fe5d.tar.bz2 kernel-common-22fb81eeb181ca53989b94fc480ac1ab1f61fe5d.zip | |
sky2: turn on clocks when doing resume
Some of these chips are disabled until clock is enabled.
This fixes:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=404107
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/net/sky2.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 881e46de3d8d..00ecbf6350dc 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -2421,6 +2421,10 @@ static int sky2_reset(struct sky2_hw *hw) return -EOPNOTSUPP; } + /* Make sure and enable all clocks */ + if (hw->chip_id == CHIP_ID_YUKON_EC_U) + sky2_pci_write32(hw, PCI_DEV_REG3, 0); + hw->chip_rev = (sky2_read8(hw, B2_MAC_CFG) & CFG_CHIP_R_MSK) >> 4; /* This rev is really old, and requires untested workarounds */ @@ -3639,6 +3643,9 @@ static int sky2_resume(struct pci_dev *pdev) pci_restore_state(pdev); pci_enable_wake(pdev, PCI_D0, 0); + + if (hw->chip_id == CHIP_ID_YUKON_EC_U) + sky2_pci_write32(hw, PCI_DEV_REG3, 0); sky2_set_power_state(hw, PCI_D0); err = sky2_reset(hw); |