aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sky2.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@linux-foundation.org>2007-04-07 16:02:27 -0700
committerJeff Garzik <jeff@garzik.org>2007-04-11 11:54:43 -0400
commit1ad5b4a5c224c5f98f9745adbcf99899624c8138 (patch)
treec9a0f9721d6293384f2b4a5a7be484052bbd6e65 /drivers/net/sky2.c
parent9a87240c67565578a9533101b930ef4a975be333 (diff)
downloadkernel_goldelico_gta04-1ad5b4a5c224c5f98f9745adbcf99899624c8138.zip
kernel_goldelico_gta04-1ad5b4a5c224c5f98f9745adbcf99899624c8138.tar.gz
kernel_goldelico_gta04-1ad5b4a5c224c5f98f9745adbcf99899624c8138.tar.bz2
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: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/sky2.c')
-rw-r--r--drivers/net/sky2.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 45c4525..b636b8a 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -3770,6 +3770,11 @@ static int sky2_resume(struct pci_dev *pdev)
goto out;
pci_enable_wake(pdev, PCI_D0, 0);
+
+ /* Re-enable all clocks */
+ if (hw->chip_id == CHIP_ID_YUKON_EX || hw->chip_id == CHIP_ID_YUKON_EC_U)
+ sky2_pci_write32(hw, PCI_DEV_REG3, 0);
+
sky2_reset(hw);
sky2_write32(hw, B0_IMSK, Y2_IS_BASE);