summaryrefslogtreecommitdiff
path: root/include/linux/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-03-02 16:32:46 +0000
committerLiam Girdwood <lrg@slimlogic.co.uk>2009-03-31 09:56:27 +0100
commitcacf90f24e80cec9334f98e0377149f943fe9f16 (patch)
treeb492ea92394f9ba2accffa478bdadc50008998fb /include/linux/regulator
parent221a7c7c9c88bf9d3ea4e191b35c7da709ca30b7 (diff)
downloadlinux-3.10-cacf90f24e80cec9334f98e0377149f943fe9f16.tar.gz
linux-3.10-cacf90f24e80cec9334f98e0377149f943fe9f16.tar.bz2
linux-3.10-cacf90f24e80cec9334f98e0377149f943fe9f16.zip
regulator: Allow boot_on regulators to be disabled by clients
Rather than incrementing the reference count for boot_on regulators (which prevents them being disabled later on) simply force the regulator to be enabled when applying the constraints. Previously boot_on was essentially equivalent to always_on. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'include/linux/regulator')
-rw-r--r--include/linux/regulator/machine.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h
index 1eb861cf4b2..5de7aa3b02a 100644
--- a/include/linux/regulator/machine.h
+++ b/include/linux/regulator/machine.h
@@ -73,7 +73,9 @@ struct regulator_state {
*
* @always_on: Set if the regulator should never be disabled.
* @boot_on: Set if the regulator is enabled when the system is initially
- * started.
+ * started. If the regulator is not enabled by the hardware or
+ * bootloader then it will be enabled when the constraints are
+ * applied.
* @apply_uV: Apply the voltage constraint when initialising.
*
* @input_uV: Input voltage for regulator when supplied by another regulator.