diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-01 11:17:08 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-01 11:17:08 +0100 |
| commit | 0a192cc8600bede44a0425402758631d410a7c6f (patch) | |
| tree | 7aeb844ebe2002ba6e05482f674e0c989be9061e | |
| parent | 39c9f80f43d754dadb2cd1adbc365840b5e99cca (diff) | |
| parent | 2a668a8bc2cbe7a464ab1212475a3efb23a94b1e (diff) | |
Merge remote-tracking branch 'regulator/topic/linar' into regulator-next
| -rw-r--r-- | drivers/regulator/core.c | 15 | ||||
| -rw-r--r-- | include/linux/regulator/consumer.h | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 815d6df8bd5..288c75abc19 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -2138,6 +2138,21 @@ int regulator_list_voltage(struct regulator *regulator, unsigned selector) EXPORT_SYMBOL_GPL(regulator_list_voltage); /** + * regulator_get_linear_step - return the voltage step size between VSEL values + * @regulator: regulator source + * + * Returns the voltage step size between VSEL values for linear + * regulators, or return 0 if the regulator isn't a linear regulator. + */ +unsigned int regulator_get_linear_step(struct regulator *regulator) +{ + struct regulator_dev *rdev = regulator->rdev; + + return rdev->desc->uV_step; +} +EXPORT_SYMBOL_GPL(regulator_get_linear_step); + +/** * regulator_is_supported_voltage - check if a voltage range can be supported * * @regulator: Regulator to check. diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h index 145022a8308..3a76389c6aa 100644 --- a/include/linux/regulator/consumer.h +++ b/include/linux/regulator/consumer.h @@ -165,6 +165,7 @@ int regulator_count_voltages(struct regulator *regulator); int regulator_list_voltage(struct regulator *regulator, unsigned selector); int regulator_is_supported_voltage(struct regulator *regulator, int min_uV, int max_uV); +unsigned int regulator_get_linear_step(struct regulator *regulator); int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV); int regulator_set_voltage_time(struct regulator *regulator, int old_uV, int new_uV); |