From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Fri, 13 Apr 2007 18:34:00 +0000 (+0200)
Subject: sky2: turn on clocks when doing resume
X-Git-Tag: v2.6.16.48~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9b258c4bcf11ec912d95c8e61d7453b07f28c63;p=thirdparty%2Fkernel%2Fstable.git

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: Adrian Bunk <bunk@stusta.de>
---

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 220ea49a4340a..e01191a69385c 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -2288,6 +2288,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);
+
 	/* disable ASF */
 	if (hw->chip_id <= CHIP_ID_YUKON_EC) {
 		sky2_write8(hw, B28_Y2_ASF_STAT_CMD, Y2_ASF_RESET);
@@ -3431,6 +3435,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);
 	err = sky2_set_power_state(hw, PCI_D0);
 	if (err)
 		goto out;