kernel: bump 5.10 to 5.10.130

[openwrt/openwrt.git] / target / linux / generic / backport-5.10 / 712-v5.13-net-phy-marvell-refactor-HWMON-OOP-style.patch

diff --git a/target/linux/generic/backport-5.10/712-v5.13-net-phy-marvell-refactor-HWMON-OOP-style.patch b/target/linux/generic/backport-5.10/712-v5.13-net-phy-marvell-refactor-HWMON-OOP-style.patch
index 13e241a400a3d9156377af692199b801907e9c8f..278df4631337179d6c4828c5c974be566d0d3250 100644 (file)
--- a/target/linux/generic/backport-5.10/712-v5.13-net-phy-marvell-refactor-HWMON-OOP-style.patch
+++ b/target/linux/generic/backport-5.10/712-v5.13-net-phy-marvell-refactor-HWMON-OOP-style.patch
@@ -18,7 +18,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/phy/marvell.c
 +++ b/drivers/net/phy/marvell.c
-@@ -2140,6 +2140,19 @@ static int marvell_vct7_cable_test_get_s
+@@ -2141,6 +2141,19 @@ static int marvell_vct7_cable_test_get_s
  }
  
  #ifdef CONFIG_HWMON
@@ -38,7 +38,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static int m88e1121_get_temp(struct phy_device *phydev, long *temp)
  {
        int oldpage;
-@@ -2183,75 +2196,6 @@ error:
+@@ -2184,75 +2197,6 @@ error:
        return phy_restore_page(phydev, oldpage, ret);
  }
  
@@ -114,7 +114,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static int m88e1510_get_temp(struct phy_device *phydev, long *temp)
  {
        int ret;
-@@ -2314,92 +2258,6 @@ static int m88e1510_get_temp_alarm(struc
+@@ -2315,92 +2259,6 @@ static int m88e1510_get_temp_alarm(struc
        return 0;
  }
  
@@ -207,7 +207,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static int m88e6390_get_temp(struct phy_device *phydev, long *temp)
  {
        int sum = 0;
-@@ -2458,63 +2316,112 @@ error:
+@@ -2459,63 +2317,112 @@ error:
        return ret;
  }
  
@@ -343,7 +343,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static int marvell_hwmon_name(struct phy_device *phydev)
-@@ -2537,49 +2444,48 @@ static int marvell_hwmon_name(struct phy
+@@ -2538,49 +2445,48 @@ static int marvell_hwmon_name(struct phy
        return 0;
  }
  
@@ -416,7 +416,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  {
        return 0;
  }
-@@ -2595,40 +2501,7 @@ static int marvell_probe(struct phy_devi
+@@ -2596,40 +2502,7 @@ static int marvell_probe(struct phy_devi
  
        phydev->priv = priv;
  
@@ -458,7 +458,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  }
  
  static struct phy_driver marvell_drivers[] = {
-@@ -2713,8 +2586,9 @@ static struct phy_driver marvell_drivers
+@@ -2714,8 +2587,9 @@ static struct phy_driver marvell_drivers
                .phy_id = MARVELL_PHY_ID_88E1121R,
                .phy_id_mask = MARVELL_PHY_ID_MASK,
                .name = "Marvell 88E1121R",
@@ -469,7 +469,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                .config_init = marvell_config_init,
                .config_aneg = m88e1121_config_aneg,
                .read_status = marvell_read_status,
-@@ -2833,9 +2707,10 @@ static struct phy_driver marvell_drivers
+@@ -2834,9 +2708,10 @@ static struct phy_driver marvell_drivers
                .phy_id = MARVELL_PHY_ID_88E1510,
                .phy_id_mask = MARVELL_PHY_ID_MASK,
                .name = "Marvell 88E1510",
@@ -481,7 +481,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                .config_init = m88e1510_config_init,
                .config_aneg = m88e1510_config_aneg,
                .read_status = marvell_read_status,
-@@ -2862,9 +2737,10 @@ static struct phy_driver marvell_drivers
+@@ -2863,9 +2738,10 @@ static struct phy_driver marvell_drivers
                .phy_id = MARVELL_PHY_ID_88E1540,
                .phy_id_mask = MARVELL_PHY_ID_MASK,
                .name = "Marvell 88E1540",
@@ -493,7 +493,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                .config_init = marvell_config_init,
                .config_aneg = m88e1510_config_aneg,
                .read_status = marvell_read_status,
-@@ -2888,7 +2764,8 @@ static struct phy_driver marvell_drivers
+@@ -2889,7 +2765,8 @@ static struct phy_driver marvell_drivers
                .phy_id = MARVELL_PHY_ID_88E1545,
                .phy_id_mask = MARVELL_PHY_ID_MASK,
                .name = "Marvell 88E1545",
@@ -503,7 +503,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                /* PHY_GBIT_FEATURES */
                .flags = PHY_POLL_CABLE_TEST,
                .config_init = marvell_config_init,
-@@ -2934,9 +2811,10 @@ static struct phy_driver marvell_drivers
+@@ -2935,9 +2812,10 @@ static struct phy_driver marvell_drivers
                .phy_id = MARVELL_PHY_ID_88E6341_FAMILY,
                .phy_id_mask = MARVELL_PHY_ID_MASK,
                .name = "Marvell 88E6341 Family",
@@ -515,7 +515,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                .config_init = marvell_config_init,
                .config_aneg = m88e6390_config_aneg,
                .read_status = marvell_read_status,
-@@ -2960,9 +2838,10 @@ static struct phy_driver marvell_drivers
+@@ -2961,9 +2839,10 @@ static struct phy_driver marvell_drivers
                .phy_id = MARVELL_PHY_ID_88E6390_FAMILY,
                .phy_id_mask = MARVELL_PHY_ID_MASK,
                .name = "Marvell 88E6390 Family",
@@ -527,7 +527,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                .config_init = marvell_config_init,
                .config_aneg = m88e6390_config_aneg,
                .read_status = marvell_read_status,
-@@ -2986,7 +2865,8 @@ static struct phy_driver marvell_drivers
+@@ -2987,7 +2866,8 @@ static struct phy_driver marvell_drivers
                .phy_id = MARVELL_PHY_ID_88E1340S,
                .phy_id_mask = MARVELL_PHY_ID_MASK,
                .name = "Marvell 88E1340S",
@@ -537,7 +537,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                /* PHY_GBIT_FEATURES */
                .config_init = marvell_config_init,
                .config_aneg = m88e1510_config_aneg,
-@@ -3008,7 +2888,8 @@ static struct phy_driver marvell_drivers
+@@ -3009,7 +2889,8 @@ static struct phy_driver marvell_drivers
                .phy_id = MARVELL_PHY_ID_88E1548P,
                .phy_id_mask = MARVELL_PHY_ID_MASK,
                .name = "Marvell 88E1548P",