]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: phy: realtek: fix rtl8221b-vm-cg name
authorAleksander Jan Bajkowski <olek2@wp.pl>
Thu, 16 Oct 2025 19:22:52 +0000 (21:22 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Oct 2025 13:10:18 +0000 (14:10 +0100)
[ Upstream commit ffff5c8fc2af2218a3332b3d5b97654599d50cde ]

When splitting the RTL8221B-VM-CG into C22 and C45 variants, the name was
accidentally changed to RTL8221B-VN-CG. This patch brings back the previous
part number.

Fixes: ad5ce743a6b0 ("net: phy: realtek: Add driver instances for rtl8221b via Clause 45")
Signed-off-by: Aleksander Jan Bajkowski <olek2@wp.pl>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20251016192325.2306757-1-olek2@wp.pl
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/phy/realtek/realtek_main.c

index 64af3b96f02885514c9a58d10cd62a669356f1da..62ef87ecc5587cc9b3d6807441e410f0c0ce6dec 100644 (file)
 #define RTL_8211FVD_PHYID                      0x001cc878
 #define RTL_8221B                              0x001cc840
 #define RTL_8221B_VB_CG                                0x001cc849
-#define RTL_8221B_VN_CG                                0x001cc84a
+#define RTL_8221B_VM_CG                                0x001cc84a
 #define RTL_8251B                              0x001cc862
 #define RTL_8261C                              0x001cc890
 
@@ -1362,16 +1362,16 @@ static int rtl8221b_vb_cg_c45_match_phy_device(struct phy_device *phydev,
        return rtlgen_is_c45_match(phydev, RTL_8221B_VB_CG, true);
 }
 
-static int rtl8221b_vn_cg_c22_match_phy_device(struct phy_device *phydev,
+static int rtl8221b_vm_cg_c22_match_phy_device(struct phy_device *phydev,
                                               const struct phy_driver *phydrv)
 {
-       return rtlgen_is_c45_match(phydev, RTL_8221B_VN_CG, false);
+       return rtlgen_is_c45_match(phydev, RTL_8221B_VM_CG, false);
 }
 
-static int rtl8221b_vn_cg_c45_match_phy_device(struct phy_device *phydev,
+static int rtl8221b_vm_cg_c45_match_phy_device(struct phy_device *phydev,
                                               const struct phy_driver *phydrv)
 {
-       return rtlgen_is_c45_match(phydev, RTL_8221B_VN_CG, true);
+       return rtlgen_is_c45_match(phydev, RTL_8221B_VM_CG, true);
 }
 
 static int rtl_internal_nbaset_match_phy_device(struct phy_device *phydev,
@@ -1718,7 +1718,7 @@ static struct phy_driver realtek_drvs[] = {
                .suspend        = genphy_c45_pma_suspend,
                .resume         = rtlgen_c45_resume,
        }, {
-               .match_phy_device = rtl8221b_vn_cg_c22_match_phy_device,
+               .match_phy_device = rtl8221b_vm_cg_c22_match_phy_device,
                .name           = "RTL8221B-VM-CG 2.5Gbps PHY (C22)",
                .probe          = rtl822x_probe,
                .get_features   = rtl822x_get_features,
@@ -1731,8 +1731,8 @@ static struct phy_driver realtek_drvs[] = {
                .read_page      = rtl821x_read_page,
                .write_page     = rtl821x_write_page,
        }, {
-               .match_phy_device = rtl8221b_vn_cg_c45_match_phy_device,
-               .name           = "RTL8221B-VN-CG 2.5Gbps PHY (C45)",
+               .match_phy_device = rtl8221b_vm_cg_c45_match_phy_device,
+               .name           = "RTL8221B-VM-CG 2.5Gbps PHY (C45)",
                .probe          = rtl822x_probe,
                .config_init    = rtl822xb_config_init,
                .get_rate_matching = rtl822xb_get_rate_matching,