|
@@ -238,7 +238,7 @@ static void bcmgenet_moca_phy_setup(struct bcmgenet_priv *priv)
|
|
bcmgenet_fixed_phy_link_update);
|
|
bcmgenet_fixed_phy_link_update);
|
|
}
|
|
}
|
|
|
|
|
|
-int bcmgenet_mii_config(struct net_device *dev)
|
|
|
|
|
|
+int bcmgenet_mii_config(struct net_device *dev, bool init)
|
|
{
|
|
{
|
|
struct bcmgenet_priv *priv = netdev_priv(dev);
|
|
struct bcmgenet_priv *priv = netdev_priv(dev);
|
|
struct phy_device *phydev = priv->phydev;
|
|
struct phy_device *phydev = priv->phydev;
|
|
@@ -327,7 +327,8 @@ int bcmgenet_mii_config(struct net_device *dev)
|
|
bcmgenet_ext_writel(priv, reg, EXT_RGMII_OOB_CTRL);
|
|
bcmgenet_ext_writel(priv, reg, EXT_RGMII_OOB_CTRL);
|
|
}
|
|
}
|
|
|
|
|
|
- dev_info_once(kdev, "configuring instance for %s\n", phy_name);
|
|
|
|
|
|
+ if (init)
|
|
|
|
+ dev_info(kdev, "configuring instance for %s\n", phy_name);
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
@@ -375,7 +376,7 @@ int bcmgenet_mii_probe(struct net_device *dev)
|
|
* PHY speed which is needed for bcmgenet_mii_config() to configure
|
|
* PHY speed which is needed for bcmgenet_mii_config() to configure
|
|
* things appropriately.
|
|
* things appropriately.
|
|
*/
|
|
*/
|
|
- ret = bcmgenet_mii_config(dev);
|
|
|
|
|
|
+ ret = bcmgenet_mii_config(dev, true);
|
|
if (ret) {
|
|
if (ret) {
|
|
phy_disconnect(priv->phydev);
|
|
phy_disconnect(priv->phydev);
|
|
return ret;
|
|
return ret;
|