power: pwm_regulator: remove redundant code

[people/ms/u-boot.git] / drivers / power / regulator / pwm_regulator.c

diff --git a/drivers/power/regulator/pwm_regulator.c b/drivers/power/regulator/pwm_regulator.c
index b0a4c5da6d807c7d0668387434bea528dd3dfa7b..b63f941990d512b2a3c94e1af9d26f6a92863648 100644 (file)
--- a/drivers/power/regulator/pwm_regulator.c
+++ b/drivers/power/regulator/pwm_regulator.c
@@ -24,15 +24,21 @@ struct pwm_regulator_info {
        int pwm_id;
        /* the period of one PWM cycle */
        int period_ns;
+       /*
+        * the polarity of one PWM
+        * 0: normal polarity
+        * 1: inverted polarity
+        */
+       bool polarity;
        struct udevice *pwm;
        /* initialize voltage of regulator */
-       unsigned int init_voltage;
+       int init_voltage;
        /* the maximum voltage of regulator */
-       unsigned int max_voltage;
+       int max_voltage;
        /* the minimum voltage of regulator */
-       unsigned int min_voltage;
+       int min_voltage;
        /* the current voltage of regulator */
-       unsigned int volt_uV;
+       int volt_uV;
 };
 
 static int pwm_regulator_enable(struct udevice *dev, bool enable)
@@ -49,7 +55,7 @@ static int pwm_voltage_to_duty_cycle_percentage(struct udevice *dev, int req_uV)
        int max_uV = priv->max_voltage;
        int diff = max_uV - min_uV;
 
-       return 100 - (((req_uV * 100) - (min_uV * 100)) / diff);
+       return ((req_uV * 100) - (min_uV * 100)) / diff;
 }
 
 static int pwm_regulator_get_voltage(struct udevice *dev)
@@ -67,19 +73,21 @@ static int pwm_regulator_set_voltage(struct udevice *dev, int uvolt)
 
        duty_cycle = pwm_voltage_to_duty_cycle_percentage(dev, uvolt);
 
-       ret = pwm_set_config(priv->pwm, priv->pwm_id,
-                       (priv->period_ns / 100) * duty_cycle, priv->period_ns);
+       ret = pwm_set_invert(priv->pwm, priv->pwm_id, priv->polarity);
        if (ret) {
-               dev_err(dev, "Failed to configure PWM\n");
+               dev_err(dev, "Failed to init PWM\n");
                return ret;
        }
 
-       ret = pwm_set_enable(priv->pwm, priv->pwm_id, true);
+       ret = pwm_set_config(priv->pwm, priv->pwm_id,
+                       priv->period_ns, (priv->period_ns / 100) * duty_cycle);
        if (ret) {
-               dev_err(dev, "Failed to enable PWM\n");
+               dev_err(dev, "Failed to configure PWM\n");
                return ret;
        }
+
        priv->volt_uV = uvolt;
+
        return ret;
 }
 
@@ -88,7 +96,7 @@ static int pwm_regulator_ofdata_to_platdata(struct udevice *dev)
        struct pwm_regulator_info *priv = dev_get_priv(dev);
        struct fdtdec_phandle_args args;
        const void *blob = gd->fdt_blob;
-       int node = dev->of_offset;
+       int node = dev_of_offset(dev);
        int ret;
 
        ret = fdtdec_parse_phandle_with_args(blob, node, "pwms", "#pwm-cells",
@@ -97,9 +105,9 @@ static int pwm_regulator_ofdata_to_platdata(struct udevice *dev)
                debug("%s: Cannot get PWM phandle: ret=%d\n", __func__, ret);
                return ret;
        }
-       /* TODO: pwm_id here from device tree if needed */
 
        priv->period_ns = args.args[1];
+       priv->polarity = args.args[2];
 
        priv->init_voltage = fdtdec_get_int(blob, node,
                        "regulator-init-microvolt", -1);
@@ -132,8 +140,6 @@ static int pwm_regulator_probe(struct udevice *dev)
        if (priv->init_voltage)
                pwm_regulator_set_voltage(dev, priv->init_voltage);
 
-       pwm_regulator_enable(dev, 1);
-
        return 0;
 }