diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2006-05-17 14:37:05 -0700 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-20 00:15:39 -0400 |
| commit | 86a31a759f2117816b8c78a049c41ead3ef9ef1c (patch) | |
| tree | af9ecd4f029f1d564859b6dfb529f4522f675d13 /drivers/net/sky2.c | |
| parent | 2d2a387199bf38c6628adb9c6184d7ab6e306148 (diff) | |
| download | kernel_samsung_smdk4412-86a31a759f2117816b8c78a049c41ead3ef9ef1c.tar.gz kernel_samsung_smdk4412-86a31a759f2117816b8c78a049c41ead3ef9ef1c.tar.bz2 kernel_samsung_smdk4412-86a31a759f2117816b8c78a049c41ead3ef9ef1c.zip | |
[PATCH] sky2: more fixes for Yukon Ultra
Logic error in the phy initialization code. Also, turn on wake on lan
bit in status control.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/sky2.c')
| -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 795adfad18b..bb185e5efa3 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -236,6 +236,7 @@ static int sky2_set_power_state(struct sky2_hw *hw, pci_power_t state) } if (hw->chip_id == CHIP_ID_YUKON_EC_U) { + sky2_write16(hw, B0_CTST, Y2_HW_WOL_ON); sky2_pci_write32(hw, PCI_DEV_REG3, 0); reg1 = sky2_pci_read32(hw, PCI_DEV_REG4); reg1 &= P_ASPM_CONTROL_MSK; @@ -307,7 +308,7 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port) u16 ctrl, ct1000, adv, pg, ledctrl, ledover; if (sky2->autoneg == AUTONEG_ENABLE && - (hw->chip_id != CHIP_ID_YUKON_XL || hw->chip_id == CHIP_ID_YUKON_EC_U)) { + !(hw->chip_id == CHIP_ID_YUKON_XL || hw->chip_id == CHIP_ID_YUKON_EC_U)) { u16 ectrl = gm_phy_read(hw, port, PHY_MARV_EXT_CTRL); ectrl &= ~(PHY_M_EC_M_DSC_MSK | PHY_M_EC_S_DSC_MSK | |