From 8f89d603493774d023073e46e0d9a1714b74d99f Mon Sep 17 00:00:00 2001
From: Qing Xu <qingx@marvell.com>
Date: Thu, 8 Nov 2012 10:31:32 +0800
Subject: [PATCH] --- yaml --- r: 343153 b: refs/heads/master c:
 560615ef8b95bb9aa4ea77ccaf3b2114dc93206f h: refs/heads/master i:   343151:
 aa0449ac40292e193df584bc643ea3448518569c v: v3

---
 [refs]                                        |  2 +-
 .../bindings/regulator/max8925-regulator.txt  | 51 +++++++++++--------
 2 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index cce488fb2f39..2134dd09af6b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45b6f8e8fc014fe404d155a657a04b25b861001d
+refs/heads/master: 560615ef8b95bb9aa4ea77ccaf3b2114dc93206f
diff --git a/trunk/Documentation/devicetree/bindings/regulator/max8925-regulator.txt b/trunk/Documentation/devicetree/bindings/regulator/max8925-regulator.txt
index 073b41d90f2c..0057695aae8f 100644
--- a/trunk/Documentation/devicetree/bindings/regulator/max8925-regulator.txt
+++ b/trunk/Documentation/devicetree/bindings/regulator/max8925-regulator.txt
@@ -1,29 +1,40 @@
 Max8925 Voltage regulators
 
-max8925 regulator device register is still handled by mfd_add_devices, not by
-of_xxx, so, it is not necessary to add compatible name. Also, those reg
-offset and id info is stored in mfd_cell(see max8925-core.c), as a result
-there is not private properties in dts.
-
-node's name should match with the definition in max8925_regulator_matches
-(see max8925-regulator.c)
-
+Required nodes:
+-nodes:
+  - SDV1 for SDV SDV1
+  - SDV2 for SDV SDV2
+  - SDV3 for SDV SDV3
+  - LDO1 for LDO LDO1
+  - LDO2 for LDO LDO2
+  - LDO3 for LDO LDO3
+  - LDO4 for LDO LDO4
+  - LDO5 for LDO LDO5
+  - LDO6 for LDO LDO6
+  - LDO7 for LDO LDO7
+  - LDO8 for LDO LDO8
+  - LDO9 for LDO LDO9
+  - LDO10 for LDO LDO10
+  - LDO11 for LDO LDO11
+  - LDO12 for LDO LDO12
+  - LDO13 for LDO LDO13
+  - LDO14 for LDO LDO14
+  - LDO15 for LDO LDO15
+  - LDO16 for LDO LDO16
+  - LDO17 for LDO LDO17
+  - LDO18 for LDO LDO18
+  - LDO19 for LDO LDO19
+  - LDO20 for LDO LDO20
 
 Optional properties:
 - Any optional property defined in bindings/regulator/regulator.txt
 
-
 Example:
 
+	SDV1 {
+		regulator-min-microvolt = <637500>;
+		regulator-max-microvolt = <1425000>;
+		regulator-boot-on;
+		regulator-always-on;
+	};
 
-	regulators {
-		SDV1 {
-			regulator-min-microvolt = <637500>;
-			regulator-max-microvolt = <1425000>;
-			regulator-boot-on;
-			regulator-always-on;
-		};
-
-		...
-		...
-	}