Skip to content

Commit

Permalink
sky2: don't reset PHY twice
Browse files Browse the repository at this point in the history
Don't need to reset PHY twice on startup.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
  • Loading branch information
Stephen Hemminger committed Oct 17, 2006
1 parent 7c74ac1 commit 7800fdd
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions drivers/net/sky2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

ctrl = gm_phy_read(hw, port, PHY_MARV_CTRL);
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;
ctrl = PHY_CT_RESET;
ct1000 = 0;
adv = PHY_AN_CSMA;
reg = 0;
Expand Down Expand Up @@ -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);
else
sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_OFF);

ctrl |= PHY_CT_RESET;
}

gma_write16(hw, port, GM_GP_CTRL, reg);
Expand Down

0 comments on commit 7800fdd

Please sign in to comment.