aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sky2.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/sky2.c')
-rw-r--r--drivers/net/sky2.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 6a594b001f58..20a8c34e6d53 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -356,16 +356,7 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
356 gm_phy_write(hw, port, PHY_MARV_EXT_ADR, pg); 356 gm_phy_write(hw, port, PHY_MARV_EXT_ADR, pg);
357 } 357 }
358 358
359 ctrl = gm_phy_read(hw, port, PHY_MARV_CTRL); 359 ctrl = PHY_CT_RESET;
360 if (sky2->autoneg == AUTONEG_DISABLE)
361 ctrl &= ~PHY_CT_ANE;
362 else
363 ctrl |= PHY_CT_ANE;
364
365 ctrl |= PHY_CT_RESET;
366 gm_phy_write(hw, port, PHY_MARV_CTRL, ctrl);
367
368 ctrl = 0;
369 ct1000 = 0; 360 ct1000 = 0;
370 adv = PHY_AN_CSMA; 361 adv = PHY_AN_CSMA;
371 reg = 0; 362 reg = 0;
@@ -450,8 +441,6 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
450 sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_ON); 441 sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_ON);
451 else 442 else
452 sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_OFF); 443 sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_OFF);
453
454 ctrl |= PHY_CT_RESET;
455 } 444 }
456 445
457 gma_write16(hw, port, GM_GP_CTRL, reg); 446 gma_write16(hw, port, GM_GP_CTRL, reg);