net: phy: broadcom: re-add check for PHY_BRCM_DIS_TXCRXC_NOENRGY on the BCM54811 PHY
Subsystems (4)
PATCH 1/1 net: phy: broadcom: re-add check for PHY_BRCM_DIS_TXCRXC_NOENRGY on the BCM54811 PHY
Restore PHY_ID_BCM54811 accidently removed by commit 5d4358ede8eb.
Fixes 5d4358ede8eb ("net: phy: broadcom: Allow BCM54210E to configure APD")
Signed-off-by Kevin Lo <[email protected]>
---
drivers/net/phy/broadcom.c +1 -1
@@ -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 ;
Quoted 4 lines · Kevin Lo
Restore
PHY_ID_BCM54811accidently removed by commit5d4358ede8eb.Fixes 5d4358ede8eb ("net: phy: broadcom: Allow BCM54210E to configure APD")Signed-off-by Kevin Lo <[email protected]>
Acked-by Florian Fainelli <[email protected]>
Sorry about that, this was due to me incorrectly merging the changes when they were forward ported, good catch!
Signature · 1 line
Florian
This patch was applied to netdev/net.git (refs/heads/master):
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
Quoted 5 lines · On Fri, 23 Jul 2021 21:59:27 +0800 you wrote:
Restore
PHY_ID_BCM54811accidently removed by commit5d4358ede8eb.Fixes 5d4358ede8eb ("net: phy: broadcom: Allow BCM54210E to configure APD")Signed-off-by Kevin Lo <[email protected]>---
Here is the summary with links:
- net: phy: broadcom: re-add check for PHY_BRCM_DIS_TXCRXC_NOENRGY on the BCM54811 PHY
https://git.kernel.org/netdev/net/c/ad4e1e48a629
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html