| Message ID | 1522150778-16364-1-git-send-email-andy.yan@rock-chips.com |
|---|---|
| State | Deferred |
| Delegated to: | Jaehoon Chung |
| Headers | show |
| Series | [U-Boot,v2] power: pwm regulator: support live tree | expand |
Hi Andy, On 03/27/2018 07:39 PM, Andy Yan wrote: > Use live tree compatible api for pwm regulator. > > Signed-off-by: Andy Yan <andy.yan@rock-chips.com> This version looks good to me. Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > > Changes in v2: > - remove unused head files > > drivers/power/regulator/pwm_regulator.c | 15 ++++----------- > 1 file changed, 4 insertions(+), 11 deletions(-) > > diff --git a/drivers/power/regulator/pwm_regulator.c b/drivers/power/regulator/pwm_regulator.c > index b63f941..29bceb5 100644 > --- a/drivers/power/regulator/pwm_regulator.c > +++ b/drivers/power/regulator/pwm_regulator.c > @@ -13,9 +13,6 @@ > #include <errno.h> > #include <pwm.h> > #include <power/regulator.h> > -#include <libfdt.h> > -#include <fdt_support.h> > -#include <fdtdec.h> > > DECLARE_GLOBAL_DATA_PTR; > > @@ -94,13 +91,10 @@ static int pwm_regulator_set_voltage(struct udevice *dev, int uvolt) > 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(dev); > + struct ofnode_phandle_args args; > int ret; > > - ret = fdtdec_parse_phandle_with_args(blob, node, "pwms", "#pwm-cells", > - 0, 0, &args); > + ret = dev_read_phandle_with_args(dev, "pwms", "#pwm-cells", 0, 0, &args); > if (ret) { > debug("%s: Cannot get PWM phandle: ret=%d\n", __func__, ret); > return ret; > @@ -109,14 +103,13 @@ static int pwm_regulator_ofdata_to_platdata(struct udevice *dev) > priv->period_ns = args.args[1]; > priv->polarity = args.args[2]; > > - priv->init_voltage = fdtdec_get_int(blob, node, > - "regulator-init-microvolt", -1); > + priv->init_voltage = dev_read_u32_default(dev, "regulator-init-microvolt", -1); > if (priv->init_voltage < 0) { > printf("Cannot find regulator pwm init_voltage\n"); > return -EINVAL; > } > > - ret = uclass_get_device_by_of_offset(UCLASS_PWM, args.node, &priv->pwm); > + ret = uclass_get_device_by_ofnode(UCLASS_PWM, args.node, &priv->pwm); > if (ret) { > debug("%s: Cannot get PWM: ret=%d\n", __func__, ret); > return ret;
Hi, On 03/27/2018 08:39 PM, Andy Yan wrote: > Use live tree compatible api for pwm regulator. > > Signed-off-by: Andy Yan <andy.yan@rock-chips.com> > Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Sorry for late. Applied to u-boot-mmc for pmic. Thanks! Best Regards, Jaehoon Chung > --- > > Changes in v2: > - remove unused head files > > drivers/power/regulator/pwm_regulator.c | 15 ++++----------- > 1 file changed, 4 insertions(+), 11 deletions(-) > > diff --git a/drivers/power/regulator/pwm_regulator.c b/drivers/power/regulator/pwm_regulator.c > index b63f941..29bceb5 100644 > --- a/drivers/power/regulator/pwm_regulator.c > +++ b/drivers/power/regulator/pwm_regulator.c > @@ -13,9 +13,6 @@ > #include <errno.h> > #include <pwm.h> > #include <power/regulator.h> > -#include <libfdt.h> > -#include <fdt_support.h> > -#include <fdtdec.h> > > DECLARE_GLOBAL_DATA_PTR; > > @@ -94,13 +91,10 @@ static int pwm_regulator_set_voltage(struct udevice *dev, int uvolt) > 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(dev); > + struct ofnode_phandle_args args; > int ret; > > - ret = fdtdec_parse_phandle_with_args(blob, node, "pwms", "#pwm-cells", > - 0, 0, &args); > + ret = dev_read_phandle_with_args(dev, "pwms", "#pwm-cells", 0, 0, &args); > if (ret) { > debug("%s: Cannot get PWM phandle: ret=%d\n", __func__, ret); > return ret; > @@ -109,14 +103,13 @@ static int pwm_regulator_ofdata_to_platdata(struct udevice *dev) > priv->period_ns = args.args[1]; > priv->polarity = args.args[2]; > > - priv->init_voltage = fdtdec_get_int(blob, node, > - "regulator-init-microvolt", -1); > + priv->init_voltage = dev_read_u32_default(dev, "regulator-init-microvolt", -1); > if (priv->init_voltage < 0) { > printf("Cannot find regulator pwm init_voltage\n"); > return -EINVAL; > } > > - ret = uclass_get_device_by_of_offset(UCLASS_PWM, args.node, &priv->pwm); > + ret = uclass_get_device_by_ofnode(UCLASS_PWM, args.node, &priv->pwm); > if (ret) { > debug("%s: Cannot get PWM: ret=%d\n", __func__, ret); > return ret; >
diff --git a/drivers/power/regulator/pwm_regulator.c b/drivers/power/regulator/pwm_regulator.c index b63f941..29bceb5 100644 --- a/drivers/power/regulator/pwm_regulator.c +++ b/drivers/power/regulator/pwm_regulator.c @@ -13,9 +13,6 @@ #include <errno.h> #include <pwm.h> #include <power/regulator.h> -#include <libfdt.h> -#include <fdt_support.h> -#include <fdtdec.h> DECLARE_GLOBAL_DATA_PTR; @@ -94,13 +91,10 @@ static int pwm_regulator_set_voltage(struct udevice *dev, int uvolt) 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(dev); + struct ofnode_phandle_args args; int ret; - ret = fdtdec_parse_phandle_with_args(blob, node, "pwms", "#pwm-cells", - 0, 0, &args); + ret = dev_read_phandle_with_args(dev, "pwms", "#pwm-cells", 0, 0, &args); if (ret) { debug("%s: Cannot get PWM phandle: ret=%d\n", __func__, ret); return ret; @@ -109,14 +103,13 @@ static int pwm_regulator_ofdata_to_platdata(struct udevice *dev) priv->period_ns = args.args[1]; priv->polarity = args.args[2]; - priv->init_voltage = fdtdec_get_int(blob, node, - "regulator-init-microvolt", -1); + priv->init_voltage = dev_read_u32_default(dev, "regulator-init-microvolt", -1); if (priv->init_voltage < 0) { printf("Cannot find regulator pwm init_voltage\n"); return -EINVAL; } - ret = uclass_get_device_by_of_offset(UCLASS_PWM, args.node, &priv->pwm); + ret = uclass_get_device_by_ofnode(UCLASS_PWM, args.node, &priv->pwm); if (ret) { debug("%s: Cannot get PWM: ret=%d\n", __func__, ret); return ret;
Use live tree compatible api for pwm regulator. Signed-off-by: Andy Yan <andy.yan@rock-chips.com> --- Changes in v2: - remove unused head files drivers/power/regulator/pwm_regulator.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)