diff options
| author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-02-26 17:18:34 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-03-02 16:32:46 -0800 |
| commit | 6c51946a6ee266a8861cecc8277f5b7009851738 (patch) | |
| tree | 6e4c8ea9e954d81208f43379918fe8ddd1f245db | |
| parent | bcaaa45c3feb2fcc36a247011970d5026c286154 (diff) | |
| download | linux-stable-6c51946a6ee266a8861cecc8277f5b7009851738.tar.gz linux-stable-6c51946a6ee266a8861cecc8277f5b7009851738.tar.bz2 linux-stable-6c51946a6ee266a8861cecc8277f5b7009851738.zip | |
sky2: pci config blocks phy power control
PHY power control won't work because writes to PCI config space
are not re-enabled.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/net/sky2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 16616f5440d0..6e494635eb21 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -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); } |