]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
sky2: phy power down needs PCI config write enabled
authorStephen Hemminger <shemminger@osdl.org>
Wed, 20 Dec 2006 21:06:35 +0000 (13:06 -0800)
committerJeff Garzik <jeff@garzik.org>
Tue, 26 Dec 2006 21:36:42 +0000 (16:36 -0500)
In order to change PCI registers (via the iomap'd window),
it needs to be enabled; this wasn't being done in sky2_phy_power
the function that turns on/off power to the PHY.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/sky2.c

index 93cb39388a1bcdfeb00e55b91d5bd4b85f1d6d7e..a6601e8d423c88ed7621291c6d4bc3839aa5e2d6 100644 (file)
@@ -569,8 +569,8 @@ static void sky2_phy_power(struct sky2_hw *hw, unsigned port, int onoff)
        if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1)
                onoff = !onoff;
 
+       sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
        reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
-
        if (onoff)
                /* Turn off phy power saving */
                reg1 &= ~phy_power[port];
@@ -579,6 +579,7 @@ static void sky2_phy_power(struct sky2_hw *hw, unsigned port, int onoff)
 
        sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
        sky2_pci_read32(hw, PCI_DEV_REG1);
+       sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
        udelay(100);
 }