net: phy: broadcom: fix BCM54XX_SHD_SCR3_TRDDAPD value for BCM54810
Subsystems (4)
PATCH 1/1 net: phy: broadcom: fix BCM54XX_SHD_SCR3_TRDDAPD value for BCM54810
Set the correct bit when checking for PHY_BRCM_DIS_TXCRXC_NOENRGY on the BCM54810 PHY.
Signed-off-by Kevin Lo <[email protected]>
---
drivers/net/phy/broadcom.c +6 -2
@@ -225,8 +225,12 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev)else val |=BCM54XX_SHD_SCR3_DLLAPD_DIS ; -if (phydev->dev_flags &PHY_BRCM_DIS_TXCRXC_NOENRGY ) - val |=BCM54XX_SHD_SCR3_TRDDAPD ; +if (phydev->dev_flags &PHY_BRCM_DIS_TXCRXC_NOENRGY ) { +if (BRCM_PHY_MODEL (phydev) ==PHY_ID_BCM54810 ) + val |=BCM54810_SHD_SCR3_TRDDAPD ; +else + val |=BCM54XX_SHD_SCR3_TRDDAPD ; + }if (orig != val)bcm_phy_write_shadow (phydev,BCM54XX_SHD_SCR3 , val);
include/linux/brcmphy.h +1 -0
@@ -255,6 +255,7 @@#define BCM54810_EXP_BROADREACH_LRE_MISC_CTL_EN (1 << 0)#define BCM54810_SHD_CLK_CTL 0x3#define BCM54810_SHD_CLK_CTL_GTXCLK_EN (1 << 9) +#define BCM54810_SHD_SCR3_TRDDAPD 0x0100/* BCM54612E Registers */ #define BCM54612E_EXP_SPARE0 (MII_BCM54XX_EXP_SEL_ETC + 0x34)
Quoted 2 lines · Kevin Lo
Set the correct bit when checking for
PHY_BRCM_DIS_TXCRXC_NOENRGYon the BCM54810 PHY.
Indeed, good catch!
Quoted 2 lines
Signed-off-by Kevin Lo <[email protected]>
Reviewed-by Florian Fainelli <[email protected]>
Is the following commit when it started to break?
Fixes 0ececcfc9267 ("net: phy: broadcom: Allow BCM54810 to use
bcm54xx_adjust_rxrefclk()")
Quoted 33 lines
---
drivers/net/phy/broadcom.c +6
-2@@ -225,8 +225,12 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev)else val |=BCM54XX_SHD_SCR3_DLLAPD_DIS ; -if (phydev->dev_flags &PHY_BRCM_DIS_TXCRXC_NOENRGY ) - val |=BCM54XX_SHD_SCR3_TRDDAPD ; +if (phydev->dev_flags &PHY_BRCM_DIS_TXCRXC_NOENRGY ) { +if (BRCM_PHY_MODEL (phydev) ==PHY_ID_BCM54810 ) + val |=BCM54810_SHD_SCR3_TRDDAPD ; +else + val |=BCM54XX_SHD_SCR3_TRDDAPD ; + }if (orig != val)bcm_phy_write_shadow (phydev,BCM54XX_SHD_SCR3 , val);include/linux/brcmphy.h +1
-0@@ -255,6 +255,7 @@#define BCM54810_EXP_BROADREACH_LRE_MISC_CTL_EN (1 << 0)#define BCM54810_SHD_CLK_CTL 0x3#define BCM54810_SHD_CLK_CTL_GTXCLK_EN (1 << 9) +#define BCM54810_SHD_SCR3_TRDDAPD 0x0100/* BCM54612E Registers */ #define BCM54612E_EXP_SPARE0 (MII_BCM54XX_EXP_SEL_ETC + 0x34)
Signature · 1 line
Florian
Quoted 9 lines · Florian Fainelli
Quoted 2 lines · Kevin Lo
Set the correct bit when checking for
PHY_BRCM_DIS_TXCRXC_NOENRGYon the BCM54810 PHY.Indeed, good catch!
Quoted 1 line
Quoted 8 lines
Quoted 1 line
Signed-off-by Kevin Lo <[email protected]>Reviewed-by Florian Fainelli <[email protected]>Is the following commit when it started to break?
Fixes 0ececcfc9267 ("net: phy: broadcom: Allow BCM54810 to use
bcm54xx_adjust_rxrefclk()")
Yes.
Quoted 36 lines
Quoted 33 lines
---
drivers/net/phy/broadcom.c +6
-2@@ -225,8 +225,12 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev)else val |=BCM54XX_SHD_SCR3_DLLAPD_DIS ; -if (phydev->dev_flags &PHY_BRCM_DIS_TXCRXC_NOENRGY ) - val |=BCM54XX_SHD_SCR3_TRDDAPD ; +if (phydev->dev_flags &PHY_BRCM_DIS_TXCRXC_NOENRGY ) { +if (BRCM_PHY_MODEL (phydev) ==PHY_ID_BCM54810 ) + val |=BCM54810_SHD_SCR3_TRDDAPD ; +else + val |=BCM54XX_SHD_SCR3_TRDDAPD ; + }if (orig != val)bcm_phy_write_shadow (phydev,BCM54XX_SHD_SCR3 , val);include/linux/brcmphy.h +1
-0@@ -255,6 +255,7 @@#define BCM54810_EXP_BROADREACH_LRE_MISC_CTL_EN (1 << 0)#define BCM54810_SHD_CLK_CTL 0x3#define BCM54810_SHD_CLK_CTL_GTXCLK_EN (1 << 9) +#define BCM54810_SHD_SCR3_TRDDAPD 0x0100/* BCM54612E Registers */ #define BCM54612E_EXP_SPARE0 (MII_BCM54XX_EXP_SEL_ETC + 0x34)Signature · 1 line
Florian
From: Kevin Lo <[email protected]>
Date: Thu, 14 May 2020 08:57:33 +0800
Quoted 4 lines
Set the correct bit when checking for
PHY_BRCM_DIS_TXCRXC_NOENRGYon the BCM54810 PHY.Signed-off-by Kevin Lo <[email protected]>
Applied to 'net', thanks.