summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-01-26 20:56:59 +0300
committerMark Brown <broonie@kernel.org>2018-01-26 20:56:59 +0300
commit73d8003749ebfd9617076213c0033e11aacf823c (patch)
tree6a284aafe523cb456a380b3f539284989822ec86 /Documentation
parent0c5b9b5d9adbad4b60491f9ba0d2af38904bb4b9 (diff)
parent00cb9f4f5ef5e98653d4726836a4482180bd2efd (diff)
downloadlinux-73d8003749ebfd9617076213c0033e11aacf823c.tar.xz
Merge remote-tracking branch 'regulator/topic/core' into regulator-next
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/regulator/regulator.txt12
1 files changed, 10 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/regulator/regulator.txt b/Documentation/devicetree/bindings/regulator/regulator.txt
index 3cbf56ce66ea..2babe15b618d 100644
--- a/Documentation/devicetree/bindings/regulator/regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/regulator.txt
@@ -42,8 +42,16 @@ Optional properties:
- regulator-state-[mem/disk] node has following common properties:
- regulator-on-in-suspend: regulator should be on in suspend state.
- regulator-off-in-suspend: regulator should be off in suspend state.
- - regulator-suspend-microvolt: regulator should be set to this voltage
- in suspend.
+ - regulator-suspend-min-microvolt: minimum voltage may be set in
+ suspend state.
+ - regulator-suspend-max-microvolt: maximum voltage may be set in
+ suspend state.
+ - regulator-suspend-microvolt: the default voltage which regulator
+ would be set in suspend. This property is now deprecated, instead
+ setting voltage for suspend mode via the API which regulator
+ driver provides is recommended.
+ - regulator-changeable-in-suspend: whether the default voltage and
+ the regulator on/off in suspend can be changed in runtime.
- regulator-mode: operating mode in the given suspend state.
The set of possible operating modes depends on the capabilities of
every hardware so the valid modes are documented on each regulator