diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 12:42:52 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 12:42:52 +0900 |
| commit | 6234427eb8b3c4cd329bcb68773d1e5389b3f83b (patch) | |
| tree | e4f6f0b2cd75527702ca044802240fb66be0f85e | |
| parent | b0e5997ef4300da08b051d2a84ce6cc11b267042 (diff) | |
| parent | d1e7de3007c6e34c5e6d5e1b707b5aba4a1cd57f (diff) | |
| download | op-kernel-dev-6234427eb8b3c4cd329bcb68773d1e5389b3f83b.zip op-kernel-dev-6234427eb8b3c4cd329bcb68773d1e5389b3f83b.tar.gz | |
Merge remote-tracking branch 'regulator/topic/change' into regulator-next
| -rw-r--r-- | drivers/regulator/core.c | 22 | ||||
| -rw-r--r-- | include/linux/regulator/consumer.h | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index e872c8b..59e0863 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1867,6 +1867,28 @@ int regulator_is_enabled(struct regulator *regulator) EXPORT_SYMBOL_GPL(regulator_is_enabled); /** + * regulator_can_change_voltage - check if regulator can change voltage + * @regulator: regulator source + * + * Returns positive if the regulator driver backing the source/client + * can change its voltage, false otherwise. Usefull for detecting fixed + * or dummy regulators and disabling voltage change logic in the client + * driver. + */ +int regulator_can_change_voltage(struct regulator *regulator) +{ + struct regulator_dev *rdev = regulator->rdev; + + if (rdev->constraints && + rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_VOLTAGE && + rdev->desc->n_voltages > 1) + return 1; + + return 0; +} +EXPORT_SYMBOL_GPL(regulator_can_change_voltage); + +/** * regulator_count_voltages - count regulator_list_voltage() selectors * @regulator: regulator source * diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h index c43cd35..5d0f7c1 100644 --- a/include/linux/regulator/consumer.h +++ b/include/linux/regulator/consumer.h @@ -160,6 +160,7 @@ int regulator_bulk_force_disable(int num_consumers, void regulator_bulk_free(int num_consumers, struct regulator_bulk_data *consumers); +int regulator_can_change_voltage(struct regulator *regulator); int regulator_count_voltages(struct regulator *regulator); int regulator_list_voltage(struct regulator *regulator, unsigned selector); int regulator_is_supported_voltage(struct regulator *regulator, |
