Fixed regulators currently always end up in the return -EINVAL else branch. In Linux, the fixed regulator driver parses the DT and will populate fixed_uV if min_uv and max_uv are equal. For barebox, it's easier to do this in the core, but the result is the same: We now can call regulator_get_voltage for fixed regulators.
Signed-off-by: Ahmad Fatoum <[email protected]> --- v3 -> v4: - fix regulator_get_voltage when min_uv = 0 (Frank) v2 -> v3: - fix botched rebase (regulator->ri-> instead of ri->) v1 -> v2: - new patch --- drivers/regulator/core.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 472b26f3a0ac..640fdf3b349e 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -574,13 +574,15 @@ EXPORT_SYMBOL_GPL(regulator_bulk_free); int regulator_get_voltage(struct regulator *regulator) { + struct regulator_internal *ri; struct regulator_dev *rdev; int sel, ret; if (!regulator) return -EINVAL; - rdev = regulator->ri->rdev; + ri = regulator->ri; + rdev = ri->rdev; if (rdev->desc->ops->get_voltage_sel) { sel = rdev->desc->ops->get_voltage_sel(rdev); @@ -593,6 +595,8 @@ int regulator_get_voltage(struct regulator *regulator) ret = rdev->desc->ops->list_voltage(rdev, 0); } else if (rdev->desc->fixed_uV && (rdev->desc->n_voltages == 1)) { ret = rdev->desc->fixed_uV; + } else if (ri->min_uv && ri->min_uv == ri->max_uv) { + ret = ri->min_uv; } else { return -EINVAL; } -- 2.30.2
