aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/phy/broadcom.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/phy/broadcom.c')
-rw-r--r--drivers/net/phy/broadcom.c22
1 files changed, 14 insertions, 8 deletions
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index 9e574ceacf43..1a2b2f2a273a 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -242,12 +242,6 @@ static int bcm50610_a0_workaround(struct phy_device *phydev)
242{ 242{
243 int err; 243 int err;
244 244
245 err = bcm54xx_exp_write(phydev, MII_BCM54XX_EXP_EXP08,
246 MII_BCM54XX_EXP_EXP08_RJCT_2MHZ |
247 MII_BCM54XX_EXP_EXP08_EARLY_DAC_WAKE);
248 if (err < 0)
249 return err;
250
251 err = bcm54xx_exp_write(phydev, MII_BCM54XX_EXP_AADJ1CH0, 245 err = bcm54xx_exp_write(phydev, MII_BCM54XX_EXP_AADJ1CH0,
252 MII_BCM54XX_EXP_AADJ1CH0_SWP_ABCD_OEN | 246 MII_BCM54XX_EXP_AADJ1CH0_SWP_ABCD_OEN |
253 MII_BCM54XX_EXP_AADJ1CH0_SWSEL_THPF); 247 MII_BCM54XX_EXP_AADJ1CH0_SWSEL_THPF);
@@ -287,8 +281,20 @@ static int bcm54xx_phydsp_config(struct phy_device *phydev)
287 if (err < 0) 281 if (err < 0)
288 return err; 282 return err;
289 283
290 if (phydev->drv->phy_id == PHY_ID_BCM50610) 284 if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM50610 ||
291 err = bcm50610_a0_workaround(phydev); 285 BRCM_PHY_MODEL(phydev) == PHY_ID_BCM50610M) {
286 /* Clear bit 9 to fix a phy interop issue. */
287 err = bcm54xx_exp_write(phydev, MII_BCM54XX_EXP_EXP08,
288 MII_BCM54XX_EXP_EXP08_RJCT_2MHZ);
289 if (err < 0)
290 goto error;
291
292 if (phydev->drv->phy_id == PHY_ID_BCM50610) {
293 err = bcm50610_a0_workaround(phydev);
294 if (err < 0)
295 goto error;
296 }
297 }
292 298
293 if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM57780) { 299 if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM57780) {
294 int val; 300 int val;