| From cc30abee461a81b6d8e7f8943ba3f09b0c4308d3 Mon Sep 17 00:00:00 2001 |
| From: Florian Fainelli <f.fainelli@gmail.com> |
| Date: Fri, 11 Oct 2019 12:53:49 -0700 |
| Subject: [PATCH] net: bcmgenet: Set phydev->dev_flags only for internal PHYs |
| |
| commit 92696286f3bb37ba50e4bd8d1beb24afb759a799 upstream. |
| |
| phydev->dev_flags is entirely dependent on the PHY device driver which |
| is going to be used, setting the internal GENET PHY revision in those |
| bits only makes sense when drivers/net/phy/bcm7xxx.c is the PHY driver |
| being used. |
| |
| Fixes: 487320c54143 ("net: bcmgenet: communicate integrated PHY revision to PHY driver") |
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> |
| Acked-by: Doug Berger <opendmb@gmail.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c |
| index 37b586b86334..e7c291bf4ed1 100644 |
| --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c |
| +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c |
| @@ -277,11 +277,12 @@ 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; |
| - u32 phy_flags; |
| + u32 phy_flags = 0; |
| int ret; |
| |
| /* Communicate the integrated PHY revision */ |
| - phy_flags = priv->gphy_rev; |
| + if (priv->internal_phy) |
| + phy_flags = priv->gphy_rev; |
| |
| /* Initialize link state variables that bcmgenet_mii_setup() uses */ |
| priv->old_link = -1; |
| -- |
| 2.7.4 |
| |
