|
@@ -2204,16 +2204,10 @@ s32 igb_phy_init_script_igp3(struct e1000_hw *hw)
|
|
|
void igb_power_up_phy_copper(struct e1000_hw *hw)
|
|
|
{
|
|
|
u16 mii_reg = 0;
|
|
|
- u16 power_reg = 0;
|
|
|
|
|
|
/* The PHY will retain its settings across a power down/up cycle */
|
|
|
hw->phy.ops.read_reg(hw, PHY_CONTROL, &mii_reg);
|
|
|
mii_reg &= ~MII_CR_POWER_DOWN;
|
|
|
- if (hw->phy.type == e1000_phy_i210) {
|
|
|
- hw->phy.ops.read_reg(hw, GS40G_COPPER_SPEC, &power_reg);
|
|
|
- power_reg &= ~GS40G_CS_POWER_DOWN;
|
|
|
- hw->phy.ops.write_reg(hw, GS40G_COPPER_SPEC, power_reg);
|
|
|
- }
|
|
|
hw->phy.ops.write_reg(hw, PHY_CONTROL, mii_reg);
|
|
|
}
|
|
|
|
|
@@ -2227,18 +2221,10 @@ void igb_power_up_phy_copper(struct e1000_hw *hw)
|
|
|
void igb_power_down_phy_copper(struct e1000_hw *hw)
|
|
|
{
|
|
|
u16 mii_reg = 0;
|
|
|
- u16 power_reg = 0;
|
|
|
|
|
|
/* The PHY will retain its settings across a power down/up cycle */
|
|
|
hw->phy.ops.read_reg(hw, PHY_CONTROL, &mii_reg);
|
|
|
mii_reg |= MII_CR_POWER_DOWN;
|
|
|
-
|
|
|
- /* i210 Phy requires an additional bit for power up/down */
|
|
|
- if (hw->phy.type == e1000_phy_i210) {
|
|
|
- hw->phy.ops.read_reg(hw, GS40G_COPPER_SPEC, &power_reg);
|
|
|
- power_reg |= GS40G_CS_POWER_DOWN;
|
|
|
- hw->phy.ops.write_reg(hw, GS40G_COPPER_SPEC, power_reg);
|
|
|
- }
|
|
|
hw->phy.ops.write_reg(hw, PHY_CONTROL, mii_reg);
|
|
|
usleep_range(1000, 2000);
|
|
|
}
|