summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/stmicro/stmmac
diff options
context:
space:
mode:
authorRomain Perier <romain.perier@gmail.com>2015-01-20 07:09:37 +0000
committerDavid S. Miller <davem@davemloft.net>2015-01-24 17:17:07 -0800
commit4cc8bfb912d29f596c1ae9ea9414d768896ba28f (patch)
tree01f7e9b80842dae8e9481a888c957cf390a7bc4b /drivers/net/ethernet/stmicro/stmmac
parent38124b14a0f87ea7fcef50ec28072dd06d12b8e6 (diff)
downloadtalos-op-linux-4cc8bfb912d29f596c1ae9ea9414d768896ba28f.tar.gz
talos-op-linux-4cc8bfb912d29f596c1ae9ea9414d768896ba28f.zip
net: stmmac: dwmac-rk: Don't set the regulator voltage for phy from the driver
As these settings can be directly expressed from devicetree for both fixed regulators and pmic-integrated regulators, it is more standard to set them from dts and let the regulator framework use the right voltage informations when it is used in the driver. Signed-off-by: Romain Perier <romain.perier@gmail.com> Tested-by: Heiko Stuebner <heiko@sntech.de> Reviewed-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac')
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
index 35f9b86bc9e5..06e163706c04 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
@@ -303,7 +303,6 @@ static int phy_power_on(struct rk_priv_data *bsp_priv, bool enable)
} else {
if (enable) {
if (!regulator_is_enabled(ldo)) {
- regulator_set_voltage(ldo, 3300000, 3300000);
ret = regulator_enable(ldo);
if (ret != 0)
dev_err(dev, "%s: fail to enable %s\n",
OpenPOWER on IntegriCloud