aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-06-17 20:21:07 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-17 20:21:07 -0400
commit5cfb277d660b8b285fc831701e91f01ec933c7b4 (patch)
tree19ce05cf7ad84cb8494360031c2b66c882ae469b /include
parent66a521bdda5681db255d4ce323c0de1a30e08f04 (diff)
parentc9ac065928d887e26da33a84210a3e3610052d31 (diff)
Merge tag 'regulator-v3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown: "A few small fixes: - Fixes for bugs in Palmas and as3722 exposed by recent changes in the core - the drivers weren't allowing the current configuration to be read sometimes. - Provide a stub for regulator_can_change_voltage() for !REGULATOR. - Make sure ltc3589 only looks at its child nodes in the device tree rather than searching the whole tree" * tag 'regulator-v3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: ltc3589: Use of_get_child_by_name regulator: palmas: Fix SMPS list for 0V regulator: add regulator_can_change_voltage stub regulator: as3722: Make 0 a valid selector
Diffstat (limited to 'include')
-rw-r--r--include/linux/regulator/consumer.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index a2d9d81038d1..14ec18d5e18b 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -395,6 +395,11 @@ static inline void regulator_bulk_free(int num_consumers,
395{ 395{
396} 396}
397 397
398static inline int regulator_can_change_voltage(struct regulator *regulator)
399{
400 return 0;
401}
402
398static inline int regulator_set_voltage(struct regulator *regulator, 403static inline int regulator_set_voltage(struct regulator *regulator,
399 int min_uV, int max_uV) 404 int min_uV, int max_uV)
400{ 405{