gpio-nct5104d: fix compilation with kernel 6.6
[openwrt/openwrt.git] / target / linux / generic / backport-6.1 / 707-v6.8-10-net-phy-at803x-make-at8031-related-DT-functions-name.patch
1 From a5ab9d8e7ae0da8328ac1637a9755311508dc8ab Mon Sep 17 00:00:00 2001
2 From: Christian Marangi <ansuelsmth@gmail.com>
3 Date: Fri, 8 Dec 2023 15:51:57 +0100
4 Subject: [PATCH 10/13] net: phy: at803x: make at8031 related DT functions name
5 more specific
6
7 Rename at8031 related DT function name to a more specific name
8 referencing they are only related to at8031 and not to the generic
9 at803x PHY family.
10
11 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
12 Signed-off-by: David S. Miller <davem@davemloft.net>
13 ---
14 drivers/net/phy/at803x.c | 16 ++++++++--------
15 1 file changed, 8 insertions(+), 8 deletions(-)
16
17 --- a/drivers/net/phy/at803x.c
18 +++ b/drivers/net/phy/at803x.c
19 @@ -583,7 +583,7 @@ static int at803x_resume(struct phy_devi
20 return phy_modify(phydev, MII_BMCR, BMCR_PDOWN | BMCR_ISOLATE, 0);
21 }
22
23 -static int at803x_rgmii_reg_set_voltage_sel(struct regulator_dev *rdev,
24 +static int at8031_rgmii_reg_set_voltage_sel(struct regulator_dev *rdev,
25 unsigned int selector)
26 {
27 struct phy_device *phydev = rdev_get_drvdata(rdev);
28 @@ -596,7 +596,7 @@ static int at803x_rgmii_reg_set_voltage_
29 AT803X_DEBUG_RGMII_1V8, 0);
30 }
31
32 -static int at803x_rgmii_reg_get_voltage_sel(struct regulator_dev *rdev)
33 +static int at8031_rgmii_reg_get_voltage_sel(struct regulator_dev *rdev)
34 {
35 struct phy_device *phydev = rdev_get_drvdata(rdev);
36 int val;
37 @@ -610,8 +610,8 @@ static int at803x_rgmii_reg_get_voltage_
38
39 static const struct regulator_ops vddio_regulator_ops = {
40 .list_voltage = regulator_list_voltage_table,
41 - .set_voltage_sel = at803x_rgmii_reg_set_voltage_sel,
42 - .get_voltage_sel = at803x_rgmii_reg_get_voltage_sel,
43 + .set_voltage_sel = at8031_rgmii_reg_set_voltage_sel,
44 + .get_voltage_sel = at8031_rgmii_reg_get_voltage_sel,
45 };
46
47 static const unsigned int vddio_voltage_table[] = {
48 @@ -666,7 +666,7 @@ static int at8031_register_regulators(st
49 return 0;
50 }
51
52 -static int at803x_sfp_insert(void *upstream, const struct sfp_eeprom_id *id)
53 +static int at8031_sfp_insert(void *upstream, const struct sfp_eeprom_id *id)
54 {
55 struct phy_device *phydev = upstream;
56 __ETHTOOL_DECLARE_LINK_MODE_MASK(phy_support);
57 @@ -710,10 +710,10 @@ static int at803x_sfp_insert(void *upstr
58 return 0;
59 }
60
61 -static const struct sfp_upstream_ops at803x_sfp_ops = {
62 +static const struct sfp_upstream_ops at8031_sfp_ops = {
63 .attach = phy_sfp_attach,
64 .detach = phy_sfp_detach,
65 - .module_insert = at803x_sfp_insert,
66 + .module_insert = at8031_sfp_insert,
67 };
68
69 static int at803x_parse_dt(struct phy_device *phydev)
70 @@ -1519,7 +1519,7 @@ static int at8031_parse_dt(struct phy_de
71 }
72
73 /* Only AR8031/8033 support 1000Base-X for SFP modules */
74 - return phy_sfp_probe(phydev, &at803x_sfp_ops);
75 + return phy_sfp_probe(phydev, &at8031_sfp_ops);
76 }
77
78 static int at8031_probe(struct phy_device *phydev)