From: Romain Perier Date: Tue, 20 Jan 2015 07:09:37 +0000 (+0000) Subject: net: stmmac: dwmac-rk: Don't set the regulator voltage for phy from the driver X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4cc8bfb912d29f596c1ae9ea9414d768896ba28f;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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 Tested-by: Heiko Stuebner Reviewed-by: Heiko Stuebner Signed-off-by: David S. Miller --- 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",