Skip to content

Commit

Permalink
net: phy: bcm54140: apply the workaround on b0 chips
Browse files Browse the repository at this point in the history
The lower three bits of the phy_id specifies the chip stepping. The
workaround is specifically for the B0 stepping. Apply it only on these
chips.

Signed-off-by: Michael Walle <[email protected]>
Reviewed-by: Andrew Lunn <[email protected]>
Reviewed-by: Florian Fainelli <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
mwalle authored and davem330 committed May 1, 2020
1 parent afcecca commit e9a6685
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions drivers/net/phy/bcm54140.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@
#define BCM54140_HWMON_IN_ALARM_BIT(ch) ((ch) ? BCM54140_RDB_MON_ISR_3V3 \
: BCM54140_RDB_MON_ISR_1V0)

#define BCM54140_PHY_ID_REV(phy_id) ((phy_id) & 0x7)
#define BCM54140_REV_B0 1

#define BCM54140_DEFAULT_DOWNSHIFT 5
#define BCM54140_MAX_DOWNSHIFT 9

Expand Down Expand Up @@ -632,9 +635,11 @@ static int bcm54140_config_init(struct phy_device *phydev)
int ret;

/* Apply hardware errata */
ret = bcm54140_b0_workaround(phydev);
if (ret)
return ret;
if (BCM54140_PHY_ID_REV(phydev->phy_id) == BCM54140_REV_B0) {
ret = bcm54140_b0_workaround(phydev);
if (ret)
return ret;
}

/* Unmask events we are interested in. */
reg &= ~(BCM54140_RDB_INT_DUPLEX |
Expand Down

0 comments on commit e9a6685

Please sign in to comment.