lkml.org 
[lkml]   [2019]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 021/119] net: bcmgenet: Set phydev->dev_flags only for internal PHYs
    Date
    From: Florian Fainelli <f.fainelli@gmail.com>

    [ Upstream commit 92696286f3bb37ba50e4bd8d1beb24afb759a799 ]

    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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/broadcom/genet/bcmmii.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
    +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
    @@ -296,11 +296,12 @@ int bcmgenet_mii_probe(struct net_device
    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;

    \
     
     \ /
      Last update: 2019-10-27 22:08    [W:3.661 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site