Commit 5d4358ed authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: phy: broadcom: Allow BCM54210E to configure APD 



BCM54210E/BCM50212E has been verified to work correctly with the
auto-power down configuration done by bcm54xx_adjust_rxrefclk(), add it
to the list of PHYs working.

While we are at it, provide an appropriate name for the bit we are
changing which disables the RXC and TXC during auto-power down when
there is no energy on the cable.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 17d3a83a

drivers/net/phy/broadcom.c

+5 −3
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev) 
	if (BRCM_PHY_MODEL(phydev) != PHY_ID_BCM57780 &&

	    BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610 &&

	    BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610M &&

	    BRCM_PHY_MODEL(phydev) != PHY_ID_BCM54210E &&

	    BRCM_PHY_MODEL(phydev) != PHY_ID_BCM54810 &&

	    BRCM_PHY_MODEL(phydev) != PHY_ID_BCM54811)

		return;
@@ -227,9 +228,10 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev) 
		val |= BCM54XX_SHD_SCR3_DLLAPD_DIS;



	if (phydev->dev_flags & PHY_BRCM_DIS_TXCRXC_NOENRGY) {

		if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54810 ||

		    BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54811)

			val |= BCM54810_SHD_SCR3_TRDDAPD;

		if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54210E ||

		    BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54810 ||

		    BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54210E)

			val |= BCM54XX_SHD_SCR3_RXCTXC_DIS;

		else

			val |= BCM54XX_SHD_SCR3_TRDDAPD;

	}

include/linux/brcmphy.h

+1 −1
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ 
#define  BCM54XX_SHD_SCR3_DEF_CLK125	0x0001

#define  BCM54XX_SHD_SCR3_DLLAPD_DIS	0x0002

#define  BCM54XX_SHD_SCR3_TRDDAPD	0x0004

#define  BCM54XX_SHD_SCR3_RXCTXC_DIS	0x0100



/* 01010: Auto Power-Down */

#define BCM54XX_SHD_APD			0x0a
@@ -253,7 +254,6 @@ 
#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)