net: phy: broadcom: Have bcm54xx_adjust_rxrefclk() check for flags
authorFlorian Fainelli <f.fainelli@gmail.com>
Wed, 19 Feb 2020 20:00:48 +0000 (12:00 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 20 Feb 2020 00:36:48 +0000 (16:36 -0800)
bcm54xx_adjust_rxrefclk() already checks for PHY_BRCM_AUTO_PWRDWN_ENABLE
and PHY_BRCM_DIS_TXCRXC_NOENRGY in order to set the appropriate bit. The
situation is a bit more complicated with the flag
PHY_BRCM_RX_REFCLK_UNUSED but essentially amounts to the same situation.

The default setting for the 125MHz clock is to be on for all PHYs and
we still treat BCM50610 and BCM50610M specifically with the polarity of
the bit reversed.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/broadcom.c

index 4ad2128cc4542286e0c6c741ab0b7f1e87596a33..b4eae84a9195c8bbeecb5f06f5cda16cdcc0ff8a 100644 (file)
@@ -273,10 +273,7 @@ static int bcm54xx_config_init(struct phy_device *phydev)
            (phydev->dev_flags & PHY_BRCM_CLEAR_RGMII_MODE))
                bcm_phy_write_shadow(phydev, BCM54XX_SHD_RGMII_MODE, 0);
 
-       if ((phydev->dev_flags & PHY_BRCM_RX_REFCLK_UNUSED) ||
-           (phydev->dev_flags & PHY_BRCM_DIS_TXCRXC_NOENRGY) ||
-           (phydev->dev_flags & PHY_BRCM_AUTO_PWRDWN_ENABLE))
-               bcm54xx_adjust_rxrefclk(phydev);
+       bcm54xx_adjust_rxrefclk(phydev);
 
        if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54210E) {
                err = bcm54210e_config_init(phydev);