]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
sky2: turn on clocks when doing resume
authorStephen Hemminger <shemminger@linux-foundation.org>
Sat, 7 Apr 2007 23:02:27 +0000 (16:02 -0700)
committerJeff Garzik <jeff@garzik.org>
Wed, 11 Apr 2007 15:54:43 +0000 (11:54 -0400)
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>
drivers/net/sky2.c

index 45c4525a46e40704220158d56cf027adb27a026d..b636b8a55ffb677f6401cdecbd20a3786b661465 100644 (file)
@@ -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);