Commit cc8a677a authored by Kevin Lo's avatar Kevin Lo Committed by David S. Miller
Browse files

net: phy: broadcom: fix BCM54XX_SHD_SCR3_TRDDAPD value for BCM54810 



Set the correct bit when checking for PHY_BRCM_DIS_TXCRXC_NOENRGY on the
BCM54810 PHY.

Fixes: 0ececcfc ("net: phy: broadcom: Allow BCM54810 to use bcm54xx_adjust_rxrefclk()")
Signed-off-by: default avatarKevin Lo <kevlo@kevlo.org>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e776af60

drivers/net/phy/broadcom.c

+6 −2
Original line number Diff line number Diff line
@@ -225,8 +225,12 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev) 
	else

		val |= BCM54XX_SHD_SCR3_DLLAPD_DIS;



	if (phydev->dev_flags & PHY_BRCM_DIS_TXCRXC_NOENRGY)

	if (phydev->dev_flags & PHY_BRCM_DIS_TXCRXC_NOENRGY) {

		if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54810)

			val |= BCM54810_SHD_SCR3_TRDDAPD;

		else

			val |= BCM54XX_SHD_SCR3_TRDDAPD;

	}



	if (orig != val)

		bcm_phy_write_shadow(phydev, BCM54XX_SHD_SCR3, val);

include/linux/brcmphy.h

+1 −0
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ 
#define BCM54810_EXP_BROADREACH_LRE_MISC_CTL_EN	(1 << 0)

#define BCM54810_SHD_CLK_CTL			0x3

#define BCM54810_SHD_CLK_CTL_GTXCLK_EN		(1 << 9)

#define BCM54810_SHD_SCR3_TRDDAPD		0x0100



/* BCM54612E Registers */

#define BCM54612E_EXP_SPARE0		(MII_BCM54XX_EXP_SEL_ETC + 0x34)

CRA Git | Maintained and supported by SUSTech CRA and CCSE