leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sky2: don't reset PHY twice

Browse Source 
Don't need to reset PHY twice on startup.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
This commit is contained in:
Stephen Hemminger 2006-10-17 10:24:10 -07:00
parent 7c74ac1c23
commit 7800fddcd0
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/sky2.c
View File

@ -356,16 +356,7 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
gm_phy_write(hw, port, PHY_MARV_EXT_ADR, pg); gm_phy_write(hw, port, PHY_MARV_EXT_ADR, pg);
} }
ctrl = gm_phy_read(hw, port, PHY_MARV_CTRL); ctrl = PHY_CT_RESET;
if (sky2->autoneg == AUTONEG_DISABLE)
ctrl &= ~PHY_CT_ANE;
else
ctrl |= PHY_CT_ANE;
ctrl |= PHY_CT_RESET;
gm_phy_write(hw, port, PHY_MARV_CTRL, ctrl);
ctrl = 0;
ct1000 = 0; ct1000 = 0;
adv = PHY_AN_CSMA; adv = PHY_AN_CSMA;
reg = 0; reg = 0;
@ -450,8 +441,6 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_ON); sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_ON);
else else
sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_OFF); sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_OFF);
ctrl |= PHY_CT_RESET;
} }
gma_write16(hw, port, GM_GP_CTRL, reg); gma_write16(hw, port, GM_GP_CTRL, reg);