mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-12-07 13:14:00 -05:00
48c9e55094
Backport of the latest upstream Realtek PHY patches. WoL uses devm_pm_set_wake_irq(), so the patch that adds this function has also been backported. Changelog: 4465ae435ddc net: phy: realtek: create rtl8211f_config_phy_eee() helper bb78b71faf60 net: phy: realtek: eliminate priv->phycr1 variable e1a31c41bef6 net: phy: realtek: allow CLKOUT to be disabled on RTL8211F(D)(I)-VD-CG 910ac7bfb1af net: phy: realtek: eliminate has_phycr2 variable 27033d069177 net: phy: realtek: eliminate priv->phycr2 variable 8e982441ba60 net: phy: realtek: create rtl8211f_config_rgmii_delay() b826bf795564 net: phy: realtek: fix RTL8211F wake-on-lan support Tested on Netgear WAX206 with RTL8221B-VB-CG. Signed-off-by: Aleksander Jan Bajkowski <olek2@wp.pl> Link: https://github.com/openwrt/openwrt/pull/20987 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
71 lines
2.9 KiB
Diff
71 lines
2.9 KiB
Diff
From ffff5c8fc2af2218a3332b3d5b97654599d50cde Mon Sep 17 00:00:00 2001
|
|
From: Aleksander Jan Bajkowski <olek2@wp.pl>
|
|
Date: Thu, 16 Oct 2025 21:22:52 +0200
|
|
Subject: [PATCH] net: phy: realtek: fix rtl8221b-vm-cg name
|
|
|
|
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>
|
|
---
|
|
drivers/net/phy/realtek/realtek_main.c | 16 ++++++++--------
|
|
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
--- a/drivers/net/phy/realtek/realtek_main.c
|
|
+++ b/drivers/net/phy/realtek/realtek_main.c
|
|
@@ -154,7 +154,7 @@
|
|
#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
|
|
|
|
@@ -1498,16 +1498,16 @@ static int rtl8221b_vb_cg_c45_match_phy_
|
|
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,
|
|
@@ -1854,7 +1854,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,
|
|
@@ -1867,8 +1867,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,
|