[PATCH] net: phy: broadcom: re-add check for PHY_BRCM_DIS_TXCRXC_NOENRGY on the BCM54811 PHY
Subsystems:
broadcom ethernet phy drivers , ethernet phy library , networking drivers , the rest
1867d
3 messages,
3 authors,
2021-07-25 · open the first message on its own page
Restore PHY_ID_BCM54811 accidently removed by commit 5d4358ede8eb.
Fixes: 5d4358ede8eb ("net: phy: broadcom: Allow BCM54210E to configure APD")
Signed-off-by: Kevin Lo <redacted>
--- 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 ;
On 7/23/2021 6:59 AM, Kevin Lo wrote: Restore PHY_ID_BCM54811 accidently removed by commit 5d4358ede8eb.
Fixes: 5d4358ede8eb ("net: phy: broadcom: Allow BCM54210E to configure APD")
Signed-off-by: Kevin Lo <redacted>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Sorry about that, this was due to me incorrectly merging the changes
when they were forward ported, good catch!
--
Florian
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
On Fri, 23 Jul 2021 21:59:27 +0800 you wrote: Restore PHY_ID_BCM54811 accidently removed by commit 5d4358ede8eb.
Fixes: 5d4358ede8eb ("net: phy: broadcom: Allow BCM54210E to configure APD")
Signed-off-by: Kevin Lo <redacted>
---
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