[openwrt/openwrt] kernel: refresh 729-net-phy-realtek-introduce-rtl822x_probe.patch

[LEDE Commits]

dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/bf3b876a6378e1d808fb07250f643b047edef23e

commit bf3b876a6378e1d808fb07250f643b047edef23e
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Sat Apr 22 12:24:40 2023 +0100

    kernel: refresh 729-net-phy-realtek-introduce-rtl822x_probe.patch
    
    The patch needs to be refreshed to apply cleanly.
    
    Fixes: 998b973157 ("kernel: net: phy: realtek: improve RealTek 2.5G PHY driver")
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 .../729-net-phy-realtek-introduce-rtl822x_probe.patch      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/target/linux/generic/pending-5.15/729-net-phy-realtek-introduce-rtl822x_probe.patch b/target/linux/generic/pending-5.15/729-net-phy-realtek-introduce-rtl822x_probe.patch
index ae4a7dfa60..4496d6cedf 100644
--- a/target/linux/generic/pending-5.15/729-net-phy-realtek-introduce-rtl822x_probe.patch
+++ b/target/linux/generic/pending-5.15/729-net-phy-realtek-introduce-rtl822x_probe.patch
@@ -24,7 +24,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
  #define RTL8366RB_POWER_SAVE			0x15
  #define RTL8366RB_POWER_SAVE_ON			BIT(12)
  
-@@ -736,6 +741,25 @@ static int rtl8226_match_phy_device(stru
+@@ -736,6 +740,25 @@ static int rtl8226_match_phy_device(stru
  	       rtlgen_supports_2_5gbps(phydev);
  }
  
@@ -50,7 +50,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
  static int rtlgen_resume(struct phy_device *phydev)
  {
  	int ret = genphy_resume(phydev);
-@@ -1009,6 +1030,7 @@ static struct phy_driver realtek_drvs[]
+@@ -1009,6 +1032,7 @@ static struct phy_driver realtek_drvs[]
  		.match_phy_device = rtl8226_match_phy_device,
  		.get_features	= rtl822x_get_features,
  		.config_aneg	= rtl822x_config_aneg,
@@ -58,7 +58,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
  		.read_status	= rtl822x_read_status,
  		.suspend	= genphy_suspend,
  		.resume		= rtlgen_resume,
-@@ -1022,6 +1044,7 @@ static struct phy_driver realtek_drvs[]
+@@ -1022,6 +1046,7 @@ static struct phy_driver realtek_drvs[]
  		.name		= "RTL8226B_RTL8221B 2.5Gbps PHY",
  		.get_features	= rtl822x_get_features,
  		.config_aneg	= rtl822x_config_aneg,
@@ -66,7 +66,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
  		.read_status	= rtl822x_read_status,
  		.suspend	= genphy_suspend,
  		.resume		= rtlgen_resume,
-@@ -1035,6 +1058,7 @@ static struct phy_driver realtek_drvs[]
+@@ -1035,6 +1060,7 @@ static struct phy_driver realtek_drvs[]
  		.name           = "RTL8226-CG 2.5Gbps PHY",
  		.get_features   = rtl822x_get_features,
  		.config_aneg    = rtl822x_config_aneg,
@@ -74,7 +74,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
  		.read_status    = rtl822x_read_status,
  		.suspend        = genphy_suspend,
  		.resume         = rtlgen_resume,
-@@ -1046,6 +1070,7 @@ static struct phy_driver realtek_drvs[]
+@@ -1046,6 +1072,7 @@ static struct phy_driver realtek_drvs[]
  		.name           = "RTL8226B-CG_RTL8221B-CG 2.5Gbps PHY",
  		.get_features   = rtl822x_get_features,
  		.config_aneg    = rtl822x_config_aneg,
@@ -82,7 +82,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
  		.read_status    = rtl822x_read_status,
  		.suspend        = genphy_suspend,
  		.resume         = rtlgen_resume,
-@@ -1058,6 +1083,7 @@ static struct phy_driver realtek_drvs[]
+@@ -1058,6 +1085,7 @@ static struct phy_driver realtek_drvs[]
  		.get_features   = rtl822x_get_features,
  		.config_init    = rtl8221b_config_init,
  		.config_aneg    = rtl822x_config_aneg,
@@ -90,7 +90,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
  		.read_status    = rtl822x_read_status,
  		.suspend        = genphy_suspend,
  		.resume         = rtlgen_resume,
-@@ -1070,6 +1096,7 @@ static struct phy_driver realtek_drvs[]
+@@ -1070,6 +1098,7 @@ static struct phy_driver realtek_drvs[]
  		.get_features   = rtl822x_get_features,
  		.config_aneg    = rtl822x_config_aneg,
  		.config_init    = rtl8221b_config_init,