diff options
| author |   Michael Walle <michael@walle.cc> | 2020-04-29 01:06:58 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-04-30 20:55:49 -0700 |
| commit | e9a66851de722dfa97a41e982266603cdb97ea3b (patch) | |
| tree | 9cf83790e74598d1d5adf3e76f6542b668ae944d /drivers/net/phy | |
| parent | net: phy: bcm54140: fix phy_id_mask (diff) | |
| download | wireguard-linux-e9a66851de722dfa97a41e982266603cdb97ea3b.tar.xz wireguard-linux-e9a66851de722dfa97a41e982266603cdb97ea3b.zip | |
net: phy: bcm54140: apply the workaround on b0 chips
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 <michael@walle.cc>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/bcm54140.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/net/phy/bcm54140.c b/drivers/net/phy/bcm54140.c index 63acf34663d9..d0498ed47878 100644 --- a/drivers/net/phy/bcm54140.c +++ b/drivers/net/phy/bcm54140.c @@ -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 @@ -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 | |