diff options
| author | Samuel Holland <samuel@sholland.org> | 2021-02-16 22:20:04 -0600 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-02-17 13:42:56 -0800 |
| commit | 1c22f54696be3b185fec5c8dd03330dc8508b2d0 (patch) | |
| tree | 3deab716a82b35d454e4e0d495d8f39115c18cbf /drivers | |
| parent | afac1d34bfb482242f5b427aebafcbd8f9ea0490 (diff) | |
| download | linux-stable-1c22f54696be3b185fec5c8dd03330dc8508b2d0.tar.gz linux-stable-1c22f54696be3b185fec5c8dd03330dc8508b2d0.tar.bz2 linux-stable-1c22f54696be3b185fec5c8dd03330dc8508b2d0.zip | |
net: stmmac: dwmac-sun8i: Use reset_control_reset
Use the appropriate function instead of reimplementing it,
and update the error message to match the code.
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Samuel Holland <samuel@sholland.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c index 3c3d0b99d3e8..b61f442ed303 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c @@ -805,12 +805,12 @@ static int sun8i_dwmac_power_internal_phy(struct stmmac_priv *priv) /* Make sure the EPHY is properly reseted, as U-Boot may leave * it at deasserted state, and thus it may fail to reset EMAC. + * + * This assumes the driver has exclusive access to the EPHY reset. */ - reset_control_assert(gmac->rst_ephy); - - ret = reset_control_deassert(gmac->rst_ephy); + ret = reset_control_reset(gmac->rst_ephy); if (ret) { - dev_err(priv->device, "Cannot deassert internal phy\n"); + dev_err(priv->device, "Cannot reset internal PHY\n"); clk_disable_unprepare(gmac->ephy_clk); return ret; } |