summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-24 11:11:33 +0100
committerMark Brown <broonie@linaro.org>2013-10-24 11:11:33 +0100
commit81e439f476a397af695e8141df6e7324a8ac4893 (patch)
tree8a79f8d7805e4f2f838a39cdc751d43a987ee1e1 /Documentation
parentcea64d8c089289baede77c324e706d748e87725f (diff)
parent5df529d440aa4f0e67be9af3718e7edf05db7d02 (diff)
downloadop-kernel-dev-81e439f476a397af695e8141df6e7324a8ac4893.zip
op-kernel-dev-81e439f476a397af695e8141df6e7324a8ac4893.tar.gz
Merge remote-tracking branch 'regulator/topic/core' into regulator-next
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/regulator/regulator.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/regulator/regulator.txt b/Documentation/devicetree/bindings/regulator/regulator.txt
index 2bd8f09..e2c7f1e 100644
--- a/Documentation/devicetree/bindings/regulator/regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/regulator.txt
@@ -14,6 +14,11 @@ Optional properties:
- 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.
+- regulator-enable-ramp-delay: The time taken, in microseconds, for the supply
+ rail to reach the target voltage, plus/minus whatever tolerance the board
+ design requires. This property describes the total system ramp time
+ required due to the combination of internal ramping of the regulator itself,
+ and board design issues such as trace capacitance and load on the supply.
Deprecated properties:
- regulator-compatible: If a regulator chip contains multiple
OpenPOWER on IntegriCloud