From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Sat, 7 Apr 2007 23:02:27 +0000 (-0700)
Subject: sky2: turn on clocks when doing resume
X-Git-Tag: v2.6.21-rc7~22^2~9
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=1ad5b4a5c224c5f98f9745adbcf99899624c8138;p=safe%2Fjmp%2Flinux-2.6

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>
---

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);