Message ID | 20240605-pmic-rk8xx-v1-2-2349fdf68aa0@cherry.de |
---|---|
State | Accepted |
Commit | b7fffd1ef227e45fac356501c984dd0621accbda |
Delegated to: | Kever Yang |
Headers | show |
Series | rockchip: rk8xx: fix broken [np]ldo callbacks | expand |
On 2024/6/5 17:33, Quentin Schulz wrote: > From: Quentin Schulz <quentin.schulz@cherry.de> > > For the sake of consistency, make all internal (starting with _) > functions expect a pmic udevice instead of a regulator udevice. > > Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > drivers/power/regulator/rk8xx.c | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/drivers/power/regulator/rk8xx.c b/drivers/power/regulator/rk8xx.c > index cce3502f89c..bd5a37e718f 100644 > --- a/drivers/power/regulator/rk8xx.c > +++ b/drivers/power/regulator/rk8xx.c > @@ -1134,14 +1134,14 @@ static int buck_get_enable(struct udevice *dev) > return _buck_get_enable(dev->parent, buck); > } > > -static int _ldo_get_value(struct udevice *dev, const struct rk8xx_reg_info *info) > +static int _ldo_get_value(struct udevice *pmic, const struct rk8xx_reg_info *info) > { > int mask = info->vsel_mask; > int ret, val; > > if (info->vsel_reg == NA) > return -ENOSYS; > - ret = pmic_reg_read(dev->parent, info->vsel_reg); > + ret = pmic_reg_read(pmic, info->vsel_reg); > if (ret < 0) > return ret; > val = ret & mask; > @@ -1154,7 +1154,7 @@ static int ldo_get_value(struct udevice *dev) > int ldo = dev->driver_data - 1; > const struct rk8xx_reg_info *info = get_ldo_reg(dev->parent, ldo, 0); > > - return _ldo_get_value(dev, info); > + return _ldo_get_value(dev->parent, info); > } > > static int nldo_get_value(struct udevice *dev) > @@ -1162,7 +1162,7 @@ static int nldo_get_value(struct udevice *dev) > int nldo = dev->driver_data - 1; > const struct rk8xx_reg_info *info = get_nldo_reg(dev->parent, nldo, 0); > > - return _ldo_get_value(dev, info); > + return _ldo_get_value(dev->parent, info); > } > > static int pldo_get_value(struct udevice *dev) > @@ -1170,10 +1170,10 @@ static int pldo_get_value(struct udevice *dev) > int pldo = dev->driver_data - 1; > const struct rk8xx_reg_info *info = get_pldo_reg(dev->parent, pldo, 0); > > - return _ldo_get_value(dev, info); > + return _ldo_get_value(dev->parent, info); > } > > -static int _ldo_set_value(struct udevice *dev, const struct rk8xx_reg_info *info, int uvolt) > +static int _ldo_set_value(struct udevice *pmic, const struct rk8xx_reg_info *info, int uvolt) > { > int mask = info->vsel_mask; > int val; > @@ -1189,7 +1189,7 @@ static int _ldo_set_value(struct udevice *dev, const struct rk8xx_reg_info *info > debug("%s: volt=%d, reg=0x%x, mask=0x%x, val=0x%x\n", > __func__, uvolt, info->vsel_reg, mask, val); > > - return pmic_clrsetbits(dev->parent, info->vsel_reg, mask, val); > + return pmic_clrsetbits(pmic, info->vsel_reg, mask, val); > } > > static int ldo_set_value(struct udevice *dev, int uvolt) > @@ -1197,7 +1197,7 @@ static int ldo_set_value(struct udevice *dev, int uvolt) > int ldo = dev->driver_data - 1; > const struct rk8xx_reg_info *info = get_ldo_reg(dev->parent, ldo, uvolt); > > - return _ldo_set_value(dev, info, uvolt); > + return _ldo_set_value(dev->parent, info, uvolt); > } > > static int nldo_set_value(struct udevice *dev, int uvolt) > @@ -1205,7 +1205,7 @@ static int nldo_set_value(struct udevice *dev, int uvolt) > int nldo = dev->driver_data - 1; > const struct rk8xx_reg_info *info = get_nldo_reg(dev->parent, nldo, uvolt); > > - return _ldo_set_value(dev, info, uvolt); > + return _ldo_set_value(dev->parent, info, uvolt); > } > > static int pldo_set_value(struct udevice *dev, int uvolt) > @@ -1213,7 +1213,7 @@ static int pldo_set_value(struct udevice *dev, int uvolt) > int pldo = dev->driver_data - 1; > const struct rk8xx_reg_info *info = get_pldo_reg(dev->parent, pldo, uvolt); > > - return _ldo_set_value(dev, info, uvolt); > + return _ldo_set_value(dev->parent, info, uvolt); > } > > static int _ldo_set_suspend_value(struct udevice *pmic, const struct rk8xx_reg_info *info, int uvolt) >
On Wed, 5 Jun 2024 at 03:33, Quentin Schulz <foss+uboot@0leil.net> wrote: > > From: Quentin Schulz <quentin.schulz@cherry.de> > > For the sake of consistency, make all internal (starting with _) > functions expect a pmic udevice instead of a regulator udevice. > > Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de> > --- > drivers/power/regulator/rk8xx.c | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org> # chromebook-bob
diff --git a/drivers/power/regulator/rk8xx.c b/drivers/power/regulator/rk8xx.c index cce3502f89c..bd5a37e718f 100644 --- a/drivers/power/regulator/rk8xx.c +++ b/drivers/power/regulator/rk8xx.c @@ -1134,14 +1134,14 @@ static int buck_get_enable(struct udevice *dev) return _buck_get_enable(dev->parent, buck); } -static int _ldo_get_value(struct udevice *dev, const struct rk8xx_reg_info *info) +static int _ldo_get_value(struct udevice *pmic, const struct rk8xx_reg_info *info) { int mask = info->vsel_mask; int ret, val; if (info->vsel_reg == NA) return -ENOSYS; - ret = pmic_reg_read(dev->parent, info->vsel_reg); + ret = pmic_reg_read(pmic, info->vsel_reg); if (ret < 0) return ret; val = ret & mask; @@ -1154,7 +1154,7 @@ static int ldo_get_value(struct udevice *dev) int ldo = dev->driver_data - 1; const struct rk8xx_reg_info *info = get_ldo_reg(dev->parent, ldo, 0); - return _ldo_get_value(dev, info); + return _ldo_get_value(dev->parent, info); } static int nldo_get_value(struct udevice *dev) @@ -1162,7 +1162,7 @@ static int nldo_get_value(struct udevice *dev) int nldo = dev->driver_data - 1; const struct rk8xx_reg_info *info = get_nldo_reg(dev->parent, nldo, 0); - return _ldo_get_value(dev, info); + return _ldo_get_value(dev->parent, info); } static int pldo_get_value(struct udevice *dev) @@ -1170,10 +1170,10 @@ static int pldo_get_value(struct udevice *dev) int pldo = dev->driver_data - 1; const struct rk8xx_reg_info *info = get_pldo_reg(dev->parent, pldo, 0); - return _ldo_get_value(dev, info); + return _ldo_get_value(dev->parent, info); } -static int _ldo_set_value(struct udevice *dev, const struct rk8xx_reg_info *info, int uvolt) +static int _ldo_set_value(struct udevice *pmic, const struct rk8xx_reg_info *info, int uvolt) { int mask = info->vsel_mask; int val; @@ -1189,7 +1189,7 @@ static int _ldo_set_value(struct udevice *dev, const struct rk8xx_reg_info *info debug("%s: volt=%d, reg=0x%x, mask=0x%x, val=0x%x\n", __func__, uvolt, info->vsel_reg, mask, val); - return pmic_clrsetbits(dev->parent, info->vsel_reg, mask, val); + return pmic_clrsetbits(pmic, info->vsel_reg, mask, val); } static int ldo_set_value(struct udevice *dev, int uvolt) @@ -1197,7 +1197,7 @@ static int ldo_set_value(struct udevice *dev, int uvolt) int ldo = dev->driver_data - 1; const struct rk8xx_reg_info *info = get_ldo_reg(dev->parent, ldo, uvolt); - return _ldo_set_value(dev, info, uvolt); + return _ldo_set_value(dev->parent, info, uvolt); } static int nldo_set_value(struct udevice *dev, int uvolt) @@ -1205,7 +1205,7 @@ static int nldo_set_value(struct udevice *dev, int uvolt) int nldo = dev->driver_data - 1; const struct rk8xx_reg_info *info = get_nldo_reg(dev->parent, nldo, uvolt); - return _ldo_set_value(dev, info, uvolt); + return _ldo_set_value(dev->parent, info, uvolt); } static int pldo_set_value(struct udevice *dev, int uvolt) @@ -1213,7 +1213,7 @@ static int pldo_set_value(struct udevice *dev, int uvolt) int pldo = dev->driver_data - 1; const struct rk8xx_reg_info *info = get_pldo_reg(dev->parent, pldo, uvolt); - return _ldo_set_value(dev, info, uvolt); + return _ldo_set_value(dev->parent, info, uvolt); } static int _ldo_set_suspend_value(struct udevice *pmic, const struct rk8xx_reg_info *info, int uvolt)