| Message ID | 20220614093856.3470672-3-marten.lindahl@axis.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | hwmon: (pmbus/ltc2978) Set voltage resolution | expand |
On Tue, Jun 14, 2022 at 11:38:55AM +0200, Mårten Lindahl wrote: > When checking if a regulator supports a voltage range, the regulator > needs to have a list_voltage callback set to the regulator_ops or else > -EINVAL will be returned. This support does not exist for the pmbus > regulators, so this patch adds pmbus_regulator_list_voltage to the > pmbus_regulator_ops. > > Signed-off-by: Mårten Lindahl <marten.lindahl@axis.com> Applied to hwmon-next. Thanks, Guenter > --- > drivers/hwmon/pmbus/pmbus_core.c | 30 ++++++++++++++++++++++++++++++ > 1 file changed, 30 insertions(+) > > diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c > index 5e0d16512fa6..f303c2598fb5 100644 > --- a/drivers/hwmon/pmbus/pmbus_core.c > +++ b/drivers/hwmon/pmbus/pmbus_core.c > @@ -2745,6 +2745,35 @@ static int pmbus_regulator_set_voltage(struct regulator_dev *rdev, int min_uv, > return _pmbus_write_word_data(client, s.page, PMBUS_VOUT_COMMAND, (u16)val); > } > > +static int pmbus_regulator_list_voltage(struct regulator_dev *rdev, > + unsigned int selector) > +{ > + struct device *dev = rdev_get_dev(rdev); > + struct i2c_client *client = to_i2c_client(dev->parent); > + int val, low, high; > + > + if (selector >= rdev->desc->n_voltages || > + selector < rdev->desc->linear_min_sel) > + return -EINVAL; > + > + selector -= rdev->desc->linear_min_sel; > + val = DIV_ROUND_CLOSEST(rdev->desc->min_uV + > + (rdev->desc->uV_step * selector), 1000); /* convert to mV */ > + > + low = pmbus_regulator_get_low_margin(client, rdev_get_id(rdev)); > + if (low < 0) > + return low; > + > + high = pmbus_regulator_get_high_margin(client, rdev_get_id(rdev)); > + if (high < 0) > + return high; > + > + if (val >= low && val <= high) > + return val * 1000; /* unit is uV */ > + > + return 0; > +} > + > const struct regulator_ops pmbus_regulator_ops = { > .enable = pmbus_regulator_enable, > .disable = pmbus_regulator_disable, > @@ -2752,6 +2781,7 @@ const struct regulator_ops pmbus_regulator_ops = { > .get_error_flags = pmbus_regulator_get_error_flags, > .get_voltage = pmbus_regulator_get_voltage, > .set_voltage = pmbus_regulator_set_voltage, > + .list_voltage = pmbus_regulator_list_voltage, > }; > EXPORT_SYMBOL_NS_GPL(pmbus_regulator_ops, PMBUS); >
diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c index 5e0d16512fa6..f303c2598fb5 100644 --- a/drivers/hwmon/pmbus/pmbus_core.c +++ b/drivers/hwmon/pmbus/pmbus_core.c @@ -2745,6 +2745,35 @@ static int pmbus_regulator_set_voltage(struct regulator_dev *rdev, int min_uv, return _pmbus_write_word_data(client, s.page, PMBUS_VOUT_COMMAND, (u16)val); } +static int pmbus_regulator_list_voltage(struct regulator_dev *rdev, + unsigned int selector) +{ + struct device *dev = rdev_get_dev(rdev); + struct i2c_client *client = to_i2c_client(dev->parent); + int val, low, high; + + if (selector >= rdev->desc->n_voltages || + selector < rdev->desc->linear_min_sel) + return -EINVAL; + + selector -= rdev->desc->linear_min_sel; + val = DIV_ROUND_CLOSEST(rdev->desc->min_uV + + (rdev->desc->uV_step * selector), 1000); /* convert to mV */ + + low = pmbus_regulator_get_low_margin(client, rdev_get_id(rdev)); + if (low < 0) + return low; + + high = pmbus_regulator_get_high_margin(client, rdev_get_id(rdev)); + if (high < 0) + return high; + + if (val >= low && val <= high) + return val * 1000; /* unit is uV */ + + return 0; +} + const struct regulator_ops pmbus_regulator_ops = { .enable = pmbus_regulator_enable, .disable = pmbus_regulator_disable, @@ -2752,6 +2781,7 @@ const struct regulator_ops pmbus_regulator_ops = { .get_error_flags = pmbus_regulator_get_error_flags, .get_voltage = pmbus_regulator_get_voltage, .set_voltage = pmbus_regulator_set_voltage, + .list_voltage = pmbus_regulator_list_voltage, }; EXPORT_SYMBOL_NS_GPL(pmbus_regulator_ops, PMBUS);
When checking if a regulator supports a voltage range, the regulator needs to have a list_voltage callback set to the regulator_ops or else -EINVAL will be returned. This support does not exist for the pmbus regulators, so this patch adds pmbus_regulator_list_voltage to the pmbus_regulator_ops. Signed-off-by: Mårten Lindahl <marten.lindahl@axis.com> --- drivers/hwmon/pmbus/pmbus_core.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)