diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-01 16:50:20 +0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-01 16:50:20 +0400 |
commit | a89f5c759857b1d1a56a4d530ad30bc1cacc58c9 (patch) | |
tree | 8bf3973a36ad031894db5ee68866dcd6916c0bc3 /Documentation | |
parent | 09f2dd88ff93a6d31e10dd5c25e2aa2a8b7b12ee (diff) | |
parent | 5b175952011adae30b531ab89cc24acb173b2ce4 (diff) | |
download | linux-a89f5c759857b1d1a56a4d530ad30bc1cacc58c9.tar.xz |
Merge remote-tracking branch 'regulator/topic/ramp' into regulator-next
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/regulator/regulator.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/regulator/regulator.txt b/Documentation/devicetree/bindings/regulator/regulator.txt index 48a3b8e5d6bd..2bd8f0978765 100644 --- a/Documentation/devicetree/bindings/regulator/regulator.txt +++ b/Documentation/devicetree/bindings/regulator/regulator.txt @@ -12,6 +12,8 @@ Optional properties: - regulator-allow-bypass: allow the regulator to go into bypass mode - <name>-supply: phandle to the parent supply/regulator node - regulator-ramp-delay: ramp delay for regulator(in uV/uS) + For hardwares which support disabling ramp rate, it should be explicitly + intialised to zero (regulator-ramp-delay = <0>) for disabling ramp delay. Deprecated properties: - regulator-compatible: If a regulator chip contains multiple |