diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-15 13:20:41 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-15 13:20:41 +1000 |
| commit | 11bbcba6e8bde773b6f1f834dc7c0f9bff48cdf1 (patch) | |
| tree | 73c4bcb2dd51d027cb7f13d096981ca770ac74f8 /Documentation/devicetree/bindings/regulator/regulator.txt | |
| parent | d7db7fc64b1f92100f49744ab8781686cdc57f4d (diff) | |
| parent | 6e8d612d6f2fc90ab7f894fb6fbf44f1a2442381 (diff) | |
Merge remote-tracking branch 'regulator/for-next'
Diffstat (limited to 'Documentation/devicetree/bindings/regulator/regulator.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/regulator.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/regulator/regulator.txt b/Documentation/devicetree/bindings/regulator/regulator.txt index abb26b58c83e..606391bea89b 100644 --- a/Documentation/devicetree/bindings/regulator/regulator.txt +++ b/Documentation/devicetree/bindings/regulator/regulator.txt @@ -13,7 +13,7 @@ Optional properties: - <name>-supply: phandle to the parent supply/regulator node - regulator-ramp-delay: ramp delay for regulator(in uV/uS) For hardware which supports disabling ramp rate, it should be explicitly - intialised to zero (regulator-ramp-delay = <0>) for disabling ramp delay. + initialised 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 |