diff options
| author | Greg Kroah-Hartman <[email protected]> | 2021-08-09 07:03:47 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2021-08-09 07:03:47 +0000 |
| commit | bd935a7b21340e2e37f51a7f2d3188145e2fcf1f (patch) | |
| tree | ac8af4e6ea552d32839c415b2f36d416ee327ea4 /drivers/net/phy/broadcom.c | |
| parent | Merge tag 'sysfs_defferred_iomem_get_mapping-5.15' of git://git.kernel.org/pu... (diff) | |
| parent | Linux 5.14-rc5 (diff) | |
| download | kernel-bd935a7b21340e2e37f51a7f2d3188145e2fcf1f.tar.gz kernel-bd935a7b21340e2e37f51a7f2d3188145e2fcf1f.zip | |
Merge 5.14-rc5 into driver-core-next
We need the driver core fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'drivers/net/phy/broadcom.c')
| -rw-r--r-- | drivers/net/phy/broadcom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c index 7bf3011b8e77..83aea5c5cd03 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -288,7 +288,7 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev) if (phydev->dev_flags & PHY_BRCM_DIS_TXCRXC_NOENRGY) { if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54210E || BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54810 || - BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54210E) + BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54811) val |= BCM54XX_SHD_SCR3_RXCTXC_DIS; else val |= BCM54XX_SHD_SCR3_TRDDAPD; |