mirror of https://gitee.com/openkylin/linux.git
net: phy: micrel: Restore led_mode and clk_sel on resume
These bits seem to be lost after a suspend/resume cycle so just set them again. Do this by splitting the handling of these bits into a function that is also called on resume. This patch fixes ethernet suspend/resume on imx6ul-14x14-evk boards. Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
e6f4292ae0
commit
79e498a9c7
|
@ -268,11 +268,31 @@ static int kszphy_nand_tree_disable(struct phy_device *phydev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
/* Some config bits need to be set again on resume, handle them here. */
|
||||
static int kszphy_config_reset(struct phy_device *phydev)
|
||||
{
|
||||
struct kszphy_priv *priv = phydev->priv;
|
||||
int ret;
|
||||
|
||||
if (priv->rmii_ref_clk_sel) {
|
||||
ret = kszphy_rmii_clk_sel(phydev, priv->rmii_ref_clk_sel_val);
|
||||
if (ret) {
|
||||
phydev_err(phydev,
|
||||
"failed to set rmii reference clock\n");
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
if (priv->led_mode >= 0)
|
||||
kszphy_setup_led(phydev, priv->type->led_mode_reg, priv->led_mode);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int kszphy_config_init(struct phy_device *phydev)
|
||||
{
|
||||
struct kszphy_priv *priv = phydev->priv;
|
||||
const struct kszphy_type *type;
|
||||
int ret;
|
||||
|
||||
if (!priv)
|
||||
return 0;
|
||||
|
@ -285,19 +305,7 @@ static int kszphy_config_init(struct phy_device *phydev)
|
|||
if (type->has_nand_tree_disable)
|
||||
kszphy_nand_tree_disable(phydev);
|
||||
|
||||
if (priv->rmii_ref_clk_sel) {
|
||||
ret = kszphy_rmii_clk_sel(phydev, priv->rmii_ref_clk_sel_val);
|
||||
if (ret) {
|
||||
phydev_err(phydev,
|
||||
"failed to set rmii reference clock\n");
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
if (priv->led_mode >= 0)
|
||||
kszphy_setup_led(phydev, type->led_mode_reg, priv->led_mode);
|
||||
|
||||
return 0;
|
||||
return kszphy_config_reset(phydev);
|
||||
}
|
||||
|
||||
static int ksz8041_config_init(struct phy_device *phydev)
|
||||
|
@ -700,8 +708,14 @@ static int kszphy_suspend(struct phy_device *phydev)
|
|||
|
||||
static int kszphy_resume(struct phy_device *phydev)
|
||||
{
|
||||
int ret;
|
||||
|
||||
genphy_resume(phydev);
|
||||
|
||||
ret = kszphy_config_reset(phydev);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
/* Enable PHY Interrupts */
|
||||
if (phy_interrupt_is_valid(phydev)) {
|
||||
phydev->interrupts = PHY_INTERRUPT_ENABLED;
|
||||
|
|
Loading…
Reference in New Issue