]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: phy: broadcom: Correct BCM5221 PHY model detection
authorJim Liu <jim.t90615@gmail.com>
Thu, 27 Mar 2025 06:29:42 +0000 (14:29 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Apr 2025 12:39:27 +0000 (14:39 +0200)
[ Upstream commit 4f1eaabb4b66a1f7473f584e14e15b2ac19dfaf3 ]

Correct detect condition is applied to the entire 5221 family of PHYs.

Fixes: 3abbd0699b67 ("net: phy: broadcom: add support for BCM5221 phy")
Signed-off-by: Jim Liu <jim.t90615@gmail.com>
Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/phy/broadcom.c

index ddded162c44c134836662f2940454e90fed32ec0..d2a9cf3fde5aceb3b5a1d698e85bbfdc68765ca5 100644 (file)
@@ -859,7 +859,7 @@ static int brcm_fet_config_init(struct phy_device *phydev)
                return reg;
 
        /* Unmask events we are interested in and mask interrupts globally. */
-       if (phydev->phy_id == PHY_ID_BCM5221)
+       if (phydev->drv->phy_id == PHY_ID_BCM5221)
                reg = MII_BRCM_FET_IR_ENABLE |
                      MII_BRCM_FET_IR_MASK;
        else
@@ -888,7 +888,7 @@ static int brcm_fet_config_init(struct phy_device *phydev)
                return err;
        }
 
-       if (phydev->phy_id != PHY_ID_BCM5221) {
+       if (phydev->drv->phy_id != PHY_ID_BCM5221) {
                /* Set the LED mode */
                reg = __phy_read(phydev, MII_BRCM_FET_SHDW_AUXMODE4);
                if (reg < 0) {
@@ -1009,7 +1009,7 @@ static int brcm_fet_suspend(struct phy_device *phydev)
                return err;
        }
 
-       if (phydev->phy_id == PHY_ID_BCM5221)
+       if (phydev->drv->phy_id == PHY_ID_BCM5221)
                /* Force Low Power Mode with clock enabled */
                reg = BCM5221_SHDW_AM4_EN_CLK_LPM | BCM5221_SHDW_AM4_FORCE_LPM;
        else