diff options
author | Florian Fainelli <f.fainelli@gmail.com> | 2014-02-17 13:34:02 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-02-17 16:40:08 -0500 |
commit | 797ac07137d9ae8572008e21e6123a9ae17dae50 (patch) | |
tree | cb4753c7b10f5e950542f34dd6782e65291991c3 /drivers/net/phy/phy_device.c | |
parent | ee0c4c39c577d07c05749a5f5b960b4c0fdd8097 (diff) | |
download | op-kernel-dev-797ac07137d9ae8572008e21e6123a9ae17dae50.zip op-kernel-dev-797ac07137d9ae8572008e21e6123a9ae17dae50.tar.gz |
net: phy: move PHY software reset to genphy_soft_reset
As pointed out by Shaohui, this function is generic for 10/100/1000
PHYs, but 10G PHYs might have a slightly different reset sequence which
prevents most of them from using this function.
Move the BMCR_RESET based software resent sequence to
genphy_soft_reset() in preparation for allowing PHY drivers to implement
a soft_reset() callback.
Reported-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/phy_device.c')
-rw-r--r-- | drivers/net/phy/phy_device.c | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index c2d778d..7c21b82 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -540,11 +540,7 @@ int phy_init_hw(struct phy_device *phydev) if (!phydev->drv || !phydev->drv->config_init) return 0; - ret = phy_write(phydev, MII_BMCR, BMCR_RESET); - if (ret < 0) - return ret; - - ret = phy_poll_reset(phydev); + ret = genphy_soft_reset(phydev); if (ret < 0) return ret; @@ -1045,6 +1041,27 @@ static int gen10g_read_status(struct phy_device *phydev) return 0; } +/** + * genphy_soft_reset - software reset the PHY via BMCR_RESET bit + * @phydev: target phy_device struct + * + * Description: Perform a software PHY reset using the standard + * BMCR_RESET bit and poll for the reset bit to be cleared. + * + * Returns: 0 on success, < 0 on failure + */ +int genphy_soft_reset(struct phy_device *phydev) +{ + int ret; + + ret = phy_write(phydev, MII_BMCR, BMCR_RESET); + if (ret < 0) + return ret; + + return phy_poll_reset(phydev); +} +EXPORT_SYMBOL(genphy_soft_reset); + static int genphy_config_init(struct phy_device *phydev) { int val; |