|
@@ -298,6 +298,7 @@ int bcmgenet_mii_config(struct net_device *dev)
|
|
|
static int bcmgenet_mii_probe(struct net_device *dev)
|
|
|
{
|
|
|
struct bcmgenet_priv *priv = netdev_priv(dev);
|
|
|
+ struct device_node *dn = priv->pdev->dev.of_node;
|
|
|
struct phy_device *phydev;
|
|
|
unsigned int phy_flags;
|
|
|
int ret;
|
|
@@ -307,15 +308,19 @@ static int bcmgenet_mii_probe(struct net_device *dev)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
- if (priv->phy_dn)
|
|
|
- phydev = of_phy_connect(dev, priv->phy_dn,
|
|
|
- bcmgenet_mii_setup, 0,
|
|
|
- priv->phy_interface);
|
|
|
- else
|
|
|
- phydev = of_phy_connect_fixed_link(dev,
|
|
|
- bcmgenet_mii_setup,
|
|
|
- priv->phy_interface);
|
|
|
+ /* In the case of a fixed PHY, the DT node associated
|
|
|
+ * to the PHY is the Ethernet MAC DT node.
|
|
|
+ */
|
|
|
+ if (of_phy_is_fixed_link(dn)) {
|
|
|
+ ret = of_phy_register_fixed_link(dn);
|
|
|
+ if (ret)
|
|
|
+ return ret;
|
|
|
+
|
|
|
+ priv->phy_dn = dn;
|
|
|
+ }
|
|
|
|
|
|
+ phydev = of_phy_connect(dev, priv->phy_dn, bcmgenet_mii_setup, 0,
|
|
|
+ priv->phy_interface);
|
|
|
if (!phydev) {
|
|
|
pr_err("could not attach to PHY\n");
|
|
|
return -ENODEV;
|