diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2016-11-22 11:40:56 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-24 15:45:53 -0500 |
| commit | 99cec8a4dda28972067c274a4215422262dc5522 (patch) | |
| tree | a7fdcd8b60eb83c0cea2c1968ad2fe154e885372 /drivers/net/phy | |
| parent | d06f78c4232d6a84b50839f61d9d7fbb222d8118 (diff) | |
| download | op-kernel-dev-99cec8a4dda28972067c274a4215422262dc5522.zip op-kernel-dev-99cec8a4dda28972067c274a4215422262dc5522.tar.gz | |
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>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/bcm-cygnus.c | 2 | ||||
| -rw-r--r-- | drivers/net/phy/bcm-phy-lib.c | 14 | ||||
| -rw-r--r-- | drivers/net/phy/bcm-phy-lib.h | 2 | ||||
| -rw-r--r-- | drivers/net/phy/bcm7xxx.c | 2 |
4 files changed, 13 insertions, 7 deletions
diff --git a/drivers/net/phy/bcm-cygnus.c b/drivers/net/phy/bcm-cygnus.c index 49bbc68..196400c 100644 --- a/drivers/net/phy/bcm-cygnus.c +++ b/drivers/net/phy/bcm-cygnus.c @@ -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; diff --git a/drivers/net/phy/bcm-phy-lib.c b/drivers/net/phy/bcm-phy-lib.c index d742894..3156ce6 100644 --- a/drivers/net/phy/bcm-phy-lib.c +++ b/drivers/net/phy/bcm-phy-lib.c @@ -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) { diff --git a/drivers/net/phy/bcm-phy-lib.h b/drivers/net/phy/bcm-phy-lib.h index 3f492e6..a117f65 100644 --- a/drivers/net/phy/bcm-phy-lib.h +++ b/drivers/net/phy/bcm-phy-lib.h @@ -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); diff --git a/drivers/net/phy/bcm7xxx.c b/drivers/net/phy/bcm7xxx.c index 9636da0..b7789e8 100644 --- a/drivers/net/phy/bcm7xxx.c +++ b/drivers/net/phy/bcm7xxx.c @@ -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; |
