Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9918542e authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: phy: bcm7xxx: fix spurious MDIO failures during workaround 



Writing first to the AFE registers, and then the VCO, RCAL, RC_CAL
registers turned out to unveil some spurious MDIO read/write failures
which would make the workaround partially applied. The fix is to write
first to the VCO, RCAL, RC_CAL registers, and then write to the AFE
registers.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a3622f2c

drivers/net/phy/bcm7xxx.c

+15 −15
Original line number Diff line number Diff line
@@ -103,21 +103,6 @@ static void phy_write_misc(struct phy_device *phydev, 


static int bcm7xxx_28nm_afe_config_init(struct phy_device *phydev)

{

	/* write AFE_RXCONFIG_0 */

	phy_write_misc(phydev, AFE_RXCONFIG_0, 0xeb19);



	/* write AFE_RXCONFIG_1 */

	phy_write_misc(phydev, AFE_RXCONFIG_1, 0x9a3f);



	/* write AFE_RX_LP_COUNTER */

	phy_write_misc(phydev, AFE_RX_LP_COUNTER, 0x7fc7);



	/* write AFE_HPF_TRIM_OTHERS */

	phy_write_misc(phydev, AFE_HPF_TRIM_OTHERS, 0x000b);



	/* write AFTE_TX_CONFIG */

	phy_write_misc(phydev, AFE_TX_CONFIG, 0x0800);



	/* Increase VCO range to prevent unlocking problem of PLL at low

	 * temp

	 */
@@ -143,6 +128,21 @@ static int bcm7xxx_28nm_afe_config_init(struct phy_device *phydev) 
	/* Disable Reset R_CAL/RC_CAL Engine */

	phy_write_exp(phydev, CORE_EXPB0, 0x0000);



	/* write AFE_RXCONFIG_0 */

	phy_write_misc(phydev, AFE_RXCONFIG_0, 0xeb19);



	/* write AFE_RXCONFIG_1 */

	phy_write_misc(phydev, AFE_RXCONFIG_1, 0x9a3f);



	/* write AFE_RX_LP_COUNTER */

	phy_write_misc(phydev, AFE_RX_LP_COUNTER, 0x7fc7);



	/* write AFE_HPF_TRIM_OTHERS */

	phy_write_misc(phydev, AFE_HPF_TRIM_OTHERS, 0x000b);



	/* write AFTE_TX_CONFIG */

	phy_write_misc(phydev, AFE_TX_CONFIG, 0x0800);



	return 0;

}