diff options
| author | Mark Brown <broonie@kernel.org> | 2016-03-02 23:31:35 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-03-02 23:31:35 +0900 |
| commit | 07a06694cb591592842b608dd3ada839503f1134 (patch) | |
| tree | 7974b7ddf4dbdfc2ca341fc8218979b88e38de71 /Documentation/devicetree | |
| parent | 4d92325125e437e46d9198fe7dc0ebdc792ea5e0 (diff) | |
| parent | 354794dacc213da7596cefea4dbcd8c094368807 (diff) | |
Merge branch 'topic/discharge' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-max77620
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/regulator.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/regulator/regulator.txt b/Documentation/devicetree/bindings/regulator/regulator.txt index 1d112fc456aa..ecfc593cac15 100644 --- a/Documentation/devicetree/bindings/regulator/regulator.txt +++ b/Documentation/devicetree/bindings/regulator/regulator.txt @@ -44,6 +44,11 @@ Optional properties: any consumer request. - regulator-pull-down: Enable pull down resistor when the regulator is disabled. - regulator-over-current-protection: Enable over current protection. +- regulator-active-discharge: tristate, enable/disable active discharge of + regulators. The values are: + 0: Disable active discharge. + 1: Enable active discharge. + Absence of this property will leave configuration to default. Deprecated properties: - regulator-compatible: If a regulator chip contains multiple |