diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-01 06:17:10 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-01 06:17:10 -0400 |
| commit | 60908305fb47058bfd1d621bd65ee4dd90f5f2a9 (patch) | |
| tree | 060c8b21c3db6be0ff2bd71acc4187e1753c339c /Documentation | |
| parent | 5ee6c728808d86b7c4bed316fd0a70114f4d7793 (diff) | |
| parent | 93134c7b40580ae8bb061d278a3ecffd7bbfccd6 (diff) | |
Merge remote-tracking branch 'regulator/topic/of' into regulator-next
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/regulator.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/regulator/regulator.txt b/Documentation/devicetree/bindings/regulator/regulator.txt index ecfc6ccd67ef..48a3b8e5d6bd 100644 --- a/Documentation/devicetree/bindings/regulator/regulator.txt +++ b/Documentation/devicetree/bindings/regulator/regulator.txt | |||
| @@ -9,6 +9,7 @@ Optional properties: | |||
| 9 | - regulator-max-microamp: largest current consumers may set | 9 | - regulator-max-microamp: largest current consumers may set |
| 10 | - regulator-always-on: boolean, regulator should never be disabled | 10 | - regulator-always-on: boolean, regulator should never be disabled |
| 11 | - regulator-boot-on: bootloader/firmware enabled regulator | 11 | - regulator-boot-on: bootloader/firmware enabled regulator |
| 12 | - regulator-allow-bypass: allow the regulator to go into bypass mode | ||
| 12 | - <name>-supply: phandle to the parent supply/regulator node | 13 | - <name>-supply: phandle to the parent supply/regulator node |
| 13 | - regulator-ramp-delay: ramp delay for regulator(in uV/uS) | 14 | - regulator-ramp-delay: ramp delay for regulator(in uV/uS) |
| 14 | 15 | ||