summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-08-08 09:34:40 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-08-08 09:34:40 -0700
commit84e4526f88e5904509f0226dfabdbbc9d99c7db3 (patch)
tree6ce2345aab1a5d7f373e277a0c9b4a36b3083c91
parentd56290bbc1ad0cf56b25f7cb5859305a486b1bbc (diff)
parent386c90ac747913f1a31a0cdacb14f2347114474d (diff)
Merge tag 'regulator-v3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator DT binding fixes from Mark Brown: "A couple of fixes to bring the DT binding documentation for Palmas into sync with the code" * tag 'regulator-v3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: palmas-pmic: doc: remove ti,tstep regulator: palmas-pmic: doc: fix typo for sleep-mode
-rw-r--r--Documentation/devicetree/bindings/regulator/palmas-pmic.txt4
1 files changed, 1 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/regulator/palmas-pmic.txt b/Documentation/devicetree/bindings/regulator/palmas-pmic.txt
index d5a308629c57..30b0581bb1ce 100644
--- a/Documentation/devicetree/bindings/regulator/palmas-pmic.txt
+++ b/Documentation/devicetree/bindings/regulator/palmas-pmic.txt
@@ -31,9 +31,8 @@ Optional nodes:
Optional sub-node properties:
ti,warm-reset - maintain voltage during warm reset(boolean)
ti,roof-floor - control voltage selection by pin(boolean)
- ti,sleep-mode - mode to adopt in pmic sleep 0 - off, 1 - auto,
+ ti,mode-sleep - mode to adopt in pmic sleep 0 - off, 1 - auto,
2 - eco, 3 - forced pwm
- ti,tstep - slope control 0 - Jump, 1 10mV/us, 2 5mV/us, 3 2.5mV/us
ti,smps-range - OTP has the wrong range set for the hardware so override
0 - low range, 1 - high range.
@@ -59,7 +58,6 @@ pmic {
ti,warm-reset;
ti,roof-floor;
ti,mode-sleep = <0>;
- ti,tstep = <0>;
ti,smps-range = <1>;
};