diff options
author | Mark Brown <broonie@kernel.org> | 2018-11-19 14:16:15 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-11-19 14:16:15 +0100 |
commit | ffb8c1e45e7ae648a3a1689aa71be50fb459316e (patch) | |
tree | 9861dadf0dc742e519e28eabdeee448a57c86170 /Documentation/devicetree/bindings/regulator | |
parent | regulator: Change regulator-coupled-max-spread property (diff) | |
parent | regulator: core: Keep regulators-list locked while traversing the list (diff) | |
download | linux-ffb8c1e45e7ae648a3a1689aa71be50fb459316e.tar.xz linux-ffb8c1e45e7ae648a3a1689aa71be50fb459316e.zip |
Merge branch 'topic/coupled' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-4.21 for trivial conflict
Diffstat (limited to 'Documentation/devicetree/bindings/regulator')
-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 e3a7a7a0316b..0a3f087d5844 100644 --- a/Documentation/devicetree/bindings/regulator/regulator.txt +++ b/Documentation/devicetree/bindings/regulator/regulator.txt @@ -82,6 +82,8 @@ Optional properties: - regulator-coupled-max-spread: Array of maximum spread between voltages of coupled regulators in microvolts, each value in the array relates to the corresponding couple specified by the regulator-coupled-with property. +- regulator-max-step-microvolt: Maximum difference between current and target + voltages that can be changed safely in a single step. Deprecated properties: - regulator-compatible: If a regulator chip contains multiple |