Skip to content

Commit

Permalink
regulator: core: Allow to get voltage count and list from parent
Browse files Browse the repository at this point in the history
Load switches are modeled as regulators but they just provide
the voltage of their parent input supply. So, the drivers for
these switches usually neither provide a .list_voltage handler
not set a .n_voltages count. But there is code in the kernel
that assumes that all regulators should be able to provide this
information (e.g: cpufreq and mmc subsystems).

If the voltage count and list are not available for a regulator
and it has a parent input supply, then use the parent values.

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Javier Martinez Canillas authored and Mark Brown committed Jul 29, 2014
1 parent e303996 commit 26988ef
Showing 1 changed file with 17 additions and 6 deletions.
23 changes: 17 additions & 6 deletions drivers/regulator/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2182,7 +2182,13 @@ int regulator_count_voltages(struct regulator *regulator)
{
struct regulator_dev *rdev = regulator->rdev;

return rdev->desc->n_voltages ? : -EINVAL;
if (rdev->desc->n_voltages)
return rdev->desc->n_voltages;

if (!rdev->supply)
return -EINVAL;

return regulator_count_voltages(rdev->supply);
}
EXPORT_SYMBOL_GPL(regulator_count_voltages);

Expand All @@ -2205,12 +2211,17 @@ int regulator_list_voltage(struct regulator *regulator, unsigned selector)
if (rdev->desc->fixed_uV && rdev->desc->n_voltages == 1 && !selector)
return rdev->desc->fixed_uV;

if (!ops->list_voltage || selector >= rdev->desc->n_voltages)
if (ops->list_voltage) {
if (selector >= rdev->desc->n_voltages)
return -EINVAL;
mutex_lock(&rdev->mutex);
ret = ops->list_voltage(rdev, selector);
mutex_unlock(&rdev->mutex);
} else if (rdev->supply) {
ret = regulator_list_voltage(rdev->supply, selector);
} else {
return -EINVAL;

mutex_lock(&rdev->mutex);
ret = ops->list_voltage(rdev, selector);
mutex_unlock(&rdev->mutex);
}

if (ret > 0) {
if (ret < rdev->constraints->min_uV)
Expand Down

0 comments on commit 26988ef

Please sign in to comment.