diff options
| author | Mark Brown <broonie@kernel.org> | 2020-12-11 18:48:32 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-12-11 18:48:32 +0100 |
| commit | 5e999f10a16b90fc1d5ded8aa365e9804e894aa9 (patch) | |
| tree | 01a608e25dbfdc4f08a30e5f5c817b9146cff85d /drivers/regulator/core.c | |
| parent | regulator: axp20x: Fix DLDO2 voltage control register mask for AXP22x (diff) | |
| parent | regulator: mc13892-regulator: convert comma to semicolon (diff) | |
| download | linux-5e999f10a16b90fc1d5ded8aa365e9804e894aa9.tar.xz linux-5e999f10a16b90fc1d5ded8aa365e9804e894aa9.zip | |
Merge remote-tracking branch 'regulator/for-5.11' into regulator-next
Diffstat (limited to 'drivers/regulator/core.c')
| -rw-r--r-- | drivers/regulator/core.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 42bbd99a36ac..ca03d8e70bd1 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -2958,6 +2958,8 @@ static int _regulator_list_voltage(struct regulator_dev *rdev, if (ops->list_voltage) { if (selector >= rdev->desc->n_voltages) return -EINVAL; + if (selector < rdev->desc->linear_min_sel) + return 0; if (lock) regulator_lock(rdev); ret = ops->list_voltage(rdev, selector); @@ -3109,6 +3111,8 @@ int regulator_list_hardware_vsel(struct regulator *regulator, if (selector >= rdev->desc->n_voltages) return -EINVAL; + if (selector < rdev->desc->linear_min_sel) + return 0; if (ops->set_voltage_sel != regulator_set_voltage_sel_regmap) return -EOPNOTSUPP; @@ -4030,6 +4034,12 @@ int regulator_set_voltage_time(struct regulator *regulator, for (i = 0; i < rdev->desc->n_voltages; i++) { /* We only look for exact voltage matches here */ + if (i < rdev->desc->linear_min_sel) + continue; + + if (old_sel >= 0 && new_sel >= 0) + break; + voltage = regulator_list_voltage(regulator, i); if (voltage < 0) return -EINVAL; @@ -5305,6 +5315,8 @@ regulator_register(const struct regulator_desc *regulator_desc, /* FIXME: this currently triggers a chicken-and-egg problem * when creating -SUPPLY symlink in sysfs to a regulator * that is just being created */ + rdev_dbg(rdev, "will resolve supply early: %s\n", + rdev->supply_name); ret = regulator_resolve_supply(rdev); if (!ret) ret = set_machine_constraints(rdev); @@ -5537,7 +5549,7 @@ void regulator_set_drvdata(struct regulator *regulator, void *data) EXPORT_SYMBOL_GPL(regulator_set_drvdata); /** - * regulator_get_id - get regulator ID + * rdev_get_id - get regulator ID * @rdev: regulator */ int rdev_get_id(struct regulator_dev *rdev) |