forked from luck/tmp_suning_uos_patched
net: phy: broadcom: Allow enabling or disabling of EEE
In preparation for adding support for Wirespeed/downshift, we need to change bcm_phy_eee_enable() to allow enabling or disabling EEE, so make the function take an extra enable/disable boolean parameter and rename it to illustrate it sets EEE, not necessarily just enables it. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
d06f78c423
commit
99cec8a4dd
|
@ -104,7 +104,7 @@ static int bcm_cygnus_config_init(struct phy_device *phydev)
|
|||
return rc;
|
||||
|
||||
/* Advertise EEE */
|
||||
rc = bcm_phy_enable_eee(phydev);
|
||||
rc = bcm_phy_set_eee(phydev, true);
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
|
|
|
@ -195,7 +195,7 @@ int bcm_phy_enable_apd(struct phy_device *phydev, bool dll_pwr_down)
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(bcm_phy_enable_apd);
|
||||
|
||||
int bcm_phy_enable_eee(struct phy_device *phydev)
|
||||
int bcm_phy_set_eee(struct phy_device *phydev, bool enable)
|
||||
{
|
||||
int val;
|
||||
|
||||
|
@ -205,7 +205,10 @@ int bcm_phy_enable_eee(struct phy_device *phydev)
|
|||
if (val < 0)
|
||||
return val;
|
||||
|
||||
val |= LPI_FEATURE_EN | LPI_FEATURE_EN_DIG1000X;
|
||||
if (enable)
|
||||
val |= LPI_FEATURE_EN | LPI_FEATURE_EN_DIG1000X;
|
||||
else
|
||||
val &= ~(LPI_FEATURE_EN | LPI_FEATURE_EN_DIG1000X);
|
||||
|
||||
phy_write_mmd_indirect(phydev, BRCM_CL45VEN_EEE_CONTROL,
|
||||
MDIO_MMD_AN, (u32)val);
|
||||
|
@ -216,14 +219,17 @@ int bcm_phy_enable_eee(struct phy_device *phydev)
|
|||
if (val < 0)
|
||||
return val;
|
||||
|
||||
val |= (MDIO_AN_EEE_ADV_100TX | MDIO_AN_EEE_ADV_1000T);
|
||||
if (enable)
|
||||
val |= (MDIO_AN_EEE_ADV_100TX | MDIO_AN_EEE_ADV_1000T);
|
||||
else
|
||||
val &= ~(MDIO_AN_EEE_ADV_100TX | MDIO_AN_EEE_ADV_1000T);
|
||||
|
||||
phy_write_mmd_indirect(phydev, BCM_CL45VEN_EEE_ADV,
|
||||
MDIO_MMD_AN, (u32)val);
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(bcm_phy_enable_eee);
|
||||
EXPORT_SYMBOL_GPL(bcm_phy_set_eee);
|
||||
|
||||
int bcm_phy_downshift_get(struct phy_device *phydev, u8 *count)
|
||||
{
|
||||
|
|
|
@ -36,7 +36,7 @@ int bcm_phy_config_intr(struct phy_device *phydev);
|
|||
|
||||
int bcm_phy_enable_apd(struct phy_device *phydev, bool dll_pwr_down);
|
||||
|
||||
int bcm_phy_enable_eee(struct phy_device *phydev);
|
||||
int bcm_phy_set_eee(struct phy_device *phydev, bool enable);
|
||||
|
||||
int bcm_phy_downshift_get(struct phy_device *phydev, u8 *count);
|
||||
|
||||
|
|
|
@ -199,7 +199,7 @@ static int bcm7xxx_28nm_config_init(struct phy_device *phydev)
|
|||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = bcm_phy_enable_eee(phydev);
|
||||
ret = bcm_phy_set_eee(phydev, true);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user