aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 12:50:17 (GMT)
committerMark Brown <broonie@linaro.org>2013-09-01 12:50:17 (GMT)
commit39fe3b45d3951c3633ddb7aafb29ceef3f012761 (patch)
tree5f5c10873cef3dde53d3bbd172151c020b4b8469 /Documentation/devicetree/bindings/regulator
parentf27a5fb424d4897edd3c7735ecf054ee57a5dbd0 (diff)
parent0416ea1359b3f0a8755947f46f336608793a9649 (diff)
Merge remote-tracking branch 'regulator/topic/palmas' into regulator-next
Diffstat (limited to 'Documentation/devicetree/bindings/regulator')
-rw-r--r--Documentation/devicetree/bindings/regulator/palmas-pmic.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/regulator/palmas-pmic.txt b/Documentation/devicetree/bindings/regulator/palmas-pmic.txt
index 30b0581..a22e4c7 100644
--- a/Documentation/devicetree/bindings/regulator/palmas-pmic.txt
+++ b/Documentation/devicetree/bindings/regulator/palmas-pmic.txt
@@ -25,8 +25,8 @@ Optional nodes:
Additional custom properties are listed below.
For ti,palmas-pmic - smps12, smps123, smps3 depending on OTP,
- smps45, smps457, smps7 depending on variant, smps6, smps[8-10],
- ldo[1-9], ldoln, ldousb.
+ smps45, smps457, smps7 depending on variant, smps6, smps[8-9],
+ smps10_out2, smps10_out1, do[1-9], ldoln, ldousb.
Optional sub-node properties:
ti,warm-reset - maintain voltage during warm reset(boolean)

Privacy Policy