diff options
Diffstat (limited to 'net-stmmac-sun8i-Rename-PHY-regulator-variable-to-regulator_phy.patch')
| -rw-r--r-- | net-stmmac-sun8i-Rename-PHY-regulator-variable-to-regulator_phy.patch | 101 |
1 files changed, 101 insertions, 0 deletions
diff --git a/net-stmmac-sun8i-Rename-PHY-regulator-variable-to-regulator_phy.patch b/net-stmmac-sun8i-Rename-PHY-regulator-variable-to-regulator_phy.patch new file mode 100644 index 000000000000..942157148d12 --- /dev/null +++ b/net-stmmac-sun8i-Rename-PHY-regulator-variable-to-regulator_phy.patch @@ -0,0 +1,101 @@ +From 93aeb9e1d803bae947d8a47ce90a1a57663ee0da Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= <megi@xff.cz> +Date: Tue, 20 Aug 2019 14:29:29 +0200 +Subject: [PATCH 070/456] net: stmmac: sun8i: Rename PHY regulator variable to + regulator_phy + +We'll be adding further optional regulators, and this makes it clearer +what the regulator is for. + +Signed-off-by: Ondrej Jirman <megi@xff.cz> +--- + .../net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 40 +++++++++---------- + 1 file changed, 20 insertions(+), 20 deletions(-) + +diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +index c0c8ce1f8b00..b44f14c278ca 100644 +--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c ++++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +@@ -57,20 +57,22 @@ struct emac_variant { + }; + + /* struct sunxi_priv_data - hold all sunxi private data +- * @tx_clk: reference to MAC TX clock +- * @ephy_clk: reference to the optional EPHY clock for the internal PHY +- * @regulator: reference to the optional regulator +- * @rst_ephy: reference to the optional EPHY reset for the internal PHY +- * @variant: reference to the current board variant +- * @regmap: regmap for using the syscon +- * @internal_phy_powered: Does the internal PHY is enabled +- * @use_internal_phy: Is the internal PHY selected for use +- * @mux_handle: Internal pointer used by mdio-mux lib ++ * @tx_clk: reference to MAC TX clock ++ * @ephy_clk: reference to the optional EPHY clock for ++ * the internal PHY ++ * @regulator_phy: reference to the optional regulator ++ * @rst_ephy: reference to the optional EPHY reset for ++ * the internal PHY ++ * @variant: reference to the current board variant ++ * @regmap: regmap for using the syscon ++ * @internal_phy_powered: Does the internal PHY is enabled ++ * @use_internal_phy: Is the internal PHY selected for use ++ * @mux_handle: Internal pointer used by mdio-mux lib + */ + struct sunxi_priv_data { + struct clk *tx_clk; + struct clk *ephy_clk; +- struct regulator *regulator; ++ struct regulator *regulator_phy; + struct reset_control *rst_ephy; + const struct emac_variant *variant; + struct regmap_field *regmap_field; +@@ -571,9 +573,9 @@ static int sun8i_dwmac_init(struct platform_device *pdev, void *priv) + struct sunxi_priv_data *gmac = priv; + int ret; + +- ret = regulator_enable(gmac->regulator); ++ ret = regulator_enable(gmac->regulator_phy); + if (ret) { +- dev_err(&pdev->dev, "Fail to enable regulator\n"); ++ dev_err(&pdev->dev, "Fail to enable PHY regulator\n"); + return ret; + } + +@@ -594,8 +596,7 @@ static int sun8i_dwmac_init(struct platform_device *pdev, void *priv) + err_disable_clk: + clk_disable_unprepare(gmac->tx_clk); + err_disable_regulator: +- if (gmac->regulator) +- regulator_disable(gmac->regulator); ++ regulator_disable(gmac->regulator_phy); + + return ret; + } +@@ -1043,7 +1044,7 @@ static void sun8i_dwmac_exit(struct platform_device *pdev, void *priv) + + clk_disable_unprepare(gmac->tx_clk); + +- regulator_disable(gmac->regulator); ++ regulator_disable(gmac->regulator_phy); + } + + static void sun8i_dwmac_set_mac_loopback(void __iomem *ioaddr, bool enable) +@@ -1171,11 +1172,10 @@ static int sun8i_dwmac_probe(struct platform_device *pdev) + } + + /* Optional regulator for PHY */ +- gmac->regulator = devm_regulator_get(dev, "phy"); +- if (IS_ERR(gmac->regulator)) { +- ret = PTR_ERR(gmac->regulator); +- if (ret != -EPROBE_DEFER) +- dev_err(dev, "Failed to get PHY regulator (%d)\n", ret); ++ gmac->regulator_phy = devm_regulator_get(dev, "phy"); ++ if (IS_ERR(gmac->regulator_phy)) { ++ ret = PTR_ERR(gmac->regulator_phy); ++ dev_err_probe(dev, ret, "Failed to get PHY regulator\n"); + return ret; + } + +-- +2.34.1 + |