5 files changed, 160 insertions, 16 deletions
diff --git a/Documentation/devicetree/bindings/regulator/fixed-regulator.txt b/Documentation/devicetree/bindings/regulator/fixed-regulator.txt
index 2f5b6b1ba15..4fae41d5479 100644
--- a/Documentation/devicetree/bindings/regulator/fixed-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/fixed-regulator.txt
@@ -10,6 +10,7 @@ Optional properties:
 If this property is missing, the default assumed is Active low.
 - gpio-open-drain: GPIO is open drain type.
  If this property is missing then default assumption is false.
+-vin-supply: Input supply name.
 Any property defined as part of the core regulator
 binding, defined in regulator.txt, can also be used.
@@ -29,4 +30,5 @@ Example:
                enable-active-high;
                regulator-boot-on;
                gpio-open-drain;
+                vin-supply = <&parent_reg>;
        };
diff --git a/Documentation/devicetree/bindings/regulator/regulator.txt b/Documentation/devicetree/bindings/regulator/regulator.txt
index 5b7a408acda..66ece3f87bb 100644
--- a/Documentation/devicetree/bindings/regulator/regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/regulator.txt
@@ -10,6 +10,11 @@ Optional properties:
 - regulator-always-on: boolean, regulator should never be disabled
 - regulator-boot-on: bootloader/firmware enabled regulator
 - <name>-supply: phandle to the parent supply/regulator node
+- regulator-ramp-delay: ramp delay for regulator(in uV/uS)
+- regulator-compatible: If a regulator chip contains multiple
+  regulators, and if the chip's binding contains a child node that
+  describes each regulator, then this property indicates which regulator
+  this child node is intended to configure.
 Example:
diff --git a/Documentation/devicetree/bindings/regulator/tps65217.txt b/Documentation/devicetree/bindings/regulator/tps65217.txt
new file mode 100644
index 00000000000..0487e9675ba
--- /dev/null
+++ b/Documentation/devicetree/bindings/regulator/tps65217.txt
@@ -0,0 +1,91 @@
+TPS65217 family of regulators
+Required properties:
+- compatible: "ti,tps65217"
+- reg: I2C slave address
+- regulators: list of regulators provided by this controller, must be named
+  after their hardware counterparts: dcdc[1-3] and ldo[1-4]
+- regulators: This is the list of child nodes that specify the regulator
+  initialization data for defined regulators. Not all regulators for the given
+  device need to be present. The definition for each of these nodes is defined
+  using the standard binding for regulators found at
+  Documentation/devicetree/bindings/regulator/regulator.txt.
+  The valid names for regulators are:
+  tps65217: dcdc1, dcdc2, dcdc3, ldo1, ldo2, ldo3 and ldo4
+Each regulator is defined using the standard binding for regulators.
+Example:
+        tps: tps@24 {
+                compatible = "ti,tps65217";
+                regulators {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        dcdc1_reg: regulator@0 {
+                                reg = <0>;
+                                regulator-compatible = "dcdc1";
+                                regulator-min-microvolt = <900000>;
+                                regulator-max-microvolt = <1800000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+                        dcdc2_reg: regulator@1 {
+                                reg = <1>;
+                                regulator-compatible = "dcdc2";
+                                regulator-min-microvolt = <900000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+                        dcdc3_reg: regulator@2 {
+                                reg = <2>;
+                                regulator-compatible = "dcdc3";
+                                regulator-min-microvolt = <900000>;
+                                regulator-max-microvolt = <1500000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+                        ldo1_reg: regulator@3 {
+                                reg = <3>;
+                                regulator-compatible = "ldo1";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+                        ldo2_reg: regulator@4 {
+                                reg = <4>;
+                                regulator-compatible = "ldo2";
+                                regulator-min-microvolt = <900000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+                        ldo3_reg: regulator@5 {
+                                reg = <5>;
+                                regulator-compatible = "ldo3";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+                        ldo4_reg: regulator@6 {
+                                reg = <6>;
+                                regulator-compatible = "ldo4";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/regulator/tps6586x.txt b/Documentation/devicetree/bindings/regulator/tps6586x.txt
index 0fcabaa3baa..d156e1b5db1 100644
--- a/Documentation/devicetree/bindings/regulator/tps6586x.txt
+++ b/Documentation/devicetree/bindings/regulator/tps6586x.txt
@@ -6,8 +6,17 @@ Required properties:
 - interrupts: the interrupt outputs of the controller
 - #gpio-cells: number of cells to describe a GPIO
 - gpio-controller: mark the device as a GPIO controller
- regulators: list of regulators provided by this controller, must be named
+- regulators: list of regulators provided by this controller, must have
-  after their hardware counterparts: sm[0-2], ldo[0-9] and ldo_rtc
+  property "regulator-compatible" to match their hardware counterparts:
+  sm[0-2], ldo[0-9] and ldo_rtc
+- sm0-supply: The input supply for the SM0.
+- sm1-supply: The input supply for the SM1.
+- sm2-supply: The input supply for the SM2.
+- vinldo01-supply: The input supply for the LDO1 and LDO2
+- vinldo23-supply: The input supply for the LDO2 and LDO3
+- vinldo4-supply: The input supply for the LDO4
+- vinldo678-supply: The input supply for the LDO6, LDO7 and LDO8
+- vinldo9-supply: The input supply for the LDO9
 Each regulator is defined using the standard binding for regulators.
@@ -21,75 +30,113 @@ Example:
                #gpio-cells = <2>;
                gpio-controller;
+                sm0-supply = <&some_reg>;
+                sm1-supply = <&some_reg>;
+                sm2-supply = <&some_reg>;
+                vinldo01-supply = <...>;
+                vinldo23-supply = <...>;
+                vinldo4-supply = <...>;
+                vinldo678-supply = <...>;
+                vinldo9-supply = <...>;
                regulators {
-                        sm0_reg: sm0 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        sm0_reg: regulator@0 {
+                                reg = <0>;
+                                regulator-compatible = "sm0";
                                regulator-min-microvolt = < 725000>;
                                regulator-max-microvolt = <1500000>;
                                regulator-boot-on;
                                regulator-always-on;
                        };
-                        sm1_reg: sm1 {
+                        sm1_reg: regulator@1 {
+                                reg = <1>;
+                                regulator-compatible = "sm1";
                                regulator-min-microvolt = < 725000>;
                                regulator-max-microvolt = <1500000>;
                                regulator-boot-on;
                                regulator-always-on;
                        };
-                        sm2_reg: sm2 {
+                        sm2_reg: regulator@2 {
+                                reg = <2>;
+                                regulator-compatible = "sm2";
                                regulator-min-microvolt = <3000000>;
                                regulator-max-microvolt = <4550000>;
                                regulator-boot-on;
                                regulator-always-on;
                        };
-                        ldo0_reg: ldo0 {
+                        ldo0_reg: regulator@3 {
+                                reg = <3>;
+                                regulator-compatible = "ldo0";
                                regulator-name = "PCIE CLK";
                                regulator-min-microvolt = <3300000>;
                                regulator-max-microvolt = <3300000>;
                        };
-                        ldo1_reg: ldo1 {
+                        ldo1_reg: regulator@4 {
+                                reg = <4>;
+                                regulator-compatible = "ldo1";
                                regulator-min-microvolt = < 725000>;
                                regulator-max-microvolt = <1500000>;
                        };
-                        ldo2_reg: ldo2 {
+                        ldo2_reg: regulator@5 {
+                                reg = <5>;
+                                regulator-compatible = "ldo2";
                                regulator-min-microvolt = < 725000>;
                                regulator-max-microvolt = <1500000>;
                        };
-                        ldo3_reg: ldo3 {
+                        ldo3_reg: regulator@6 {
+                                reg = <6>;
+                                regulator-compatible = "ldo3";
                                regulator-min-microvolt = <1250000>;
                                regulator-max-microvolt = <3300000>;
                        };
-                        ldo4_reg: ldo4 {
+                        ldo4_reg: regulator@7 {
+                                reg = <7>;
+                                regulator-compatible = "ldo4";
                                regulator-min-microvolt = <1700000>;
                                regulator-max-microvolt = <2475000>;
                        };
-                        ldo5_reg: ldo5 {
+                        ldo5_reg: regulator@8 {
+                                reg = <8>;
+                                regulator-compatible = "ldo5";
                                regulator-min-microvolt = <1250000>;
                                regulator-max-microvolt = <3300000>;
                        };
-                        ldo6_reg: ldo6 {
+                        ldo6_reg: regulator@9 {
+                                reg = <9>;
+                                regulator-compatible = "ldo6";
                                regulator-min-microvolt = <1250000>;
                                regulator-max-microvolt = <3300000>;
                        };
-                        ldo7_reg: ldo7 {
+                        ldo7_reg: regulator@10 {
+                                reg = <10>;
+                                regulator-compatible = "ldo7";
                                regulator-min-microvolt = <1250000>;
                                regulator-max-microvolt = <3300000>;
                        };
-                        ldo8_reg: ldo8 {
+                        ldo8_reg: regulator@11 {
+                                reg = <11>;
+                                regulator-compatible = "ldo8";
                                regulator-min-microvolt = <1250000>;
                                regulator-max-microvolt = <3300000>;
                        };
-                        ldo9_reg: ldo9 {
+                        ldo9_reg: regulator@12 {
+                                reg = <12>;
+                                regulator-compatible = "ldo9";
                                regulator-min-microvolt = <1250000>;
                                regulator-max-microvolt = <3300000>;
                        };
diff --git a/Documentation/devicetree/bindings/regulator/twl-regulator.txt b/Documentation/devicetree/bindings/regulator/twl-regulator.txt
index 0c3395d55ac..658749b90b9 100644
--- a/Documentation/devicetree/bindings/regulator/twl-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/twl-regulator.txt
@@ -15,7 +15,6 @@ For twl6030 regulators/LDOs
  - "ti,twl6030-vusb" for VUSB LDO
  - "ti,twl6030-v1v8" for V1V8 LDO
  - "ti,twl6030-v2v1" for V2V1 LDO
-  - "ti,twl6030-clk32kg" for CLK32KG RESOURCE
  - "ti,twl6030-vdd1" for VDD1 SMPS
  - "ti,twl6030-vdd2" for VDD2 SMPS
  - "ti,twl6030-vdd3" for VDD3 SMPS

diff --git a/Documentation/devicetree/bindings/regulator/fixed-regulator.txt b/Documentation/devicetree/bindings/regulator/fixed-regulator.txt index 2f5b6b1ba15..4fae41d5479 100644 --- a/Documentation/devicetree/bindings/regulator/fixed-regulator.txt +++ b/Documentation/devicetree/bindings/regulator/fixed-regulator.txt
@@ -10,6 +10,7 @@ Optional properties:
10	If this property is missing, the default assumed is Active low.	10	If this property is missing, the default assumed is Active low.
11	- gpio-open-drain: GPIO is open drain type.	11	- gpio-open-drain: GPIO is open drain type.
12	If this property is missing then default assumption is false.	12	If this property is missing then default assumption is false.
		13	-vin-supply: Input supply name.
13		14
14	Any property defined as part of the core regulator	15	Any property defined as part of the core regulator
15	binding, defined in regulator.txt, can also be used.	16	binding, defined in regulator.txt, can also be used.
@@ -29,4 +30,5 @@ Example:
29	enable-active-high;	30	enable-active-high;
30	regulator-boot-on;	31	regulator-boot-on;
31	gpio-open-drain;	32	gpio-open-drain;
		33	vin-supply = <&parent_reg>;
32	};	34	};


diff --git a/Documentation/devicetree/bindings/regulator/regulator.txt b/Documentation/devicetree/bindings/regulator/regulator.txt index 5b7a408acda..66ece3f87bb 100644 --- a/Documentation/devicetree/bindings/regulator/regulator.txt +++ b/Documentation/devicetree/bindings/regulator/regulator.txt
@@ -10,6 +10,11 @@ Optional properties:
10	- regulator-always-on: boolean, regulator should never be disabled	10	- regulator-always-on: boolean, regulator should never be disabled
11	- regulator-boot-on: bootloader/firmware enabled regulator	11	- regulator-boot-on: bootloader/firmware enabled regulator
12	- <name>-supply: phandle to the parent supply/regulator node	12	- <name>-supply: phandle to the parent supply/regulator node
		13	- regulator-ramp-delay: ramp delay for regulator(in uV/uS)
		14	- regulator-compatible: If a regulator chip contains multiple
		15	regulators, and if the chip's binding contains a child node that
		16	describes each regulator, then this property indicates which regulator
		17	this child node is intended to configure.
13		18
14	Example:	19	Example:
15		20


diff --git a/Documentation/devicetree/bindings/regulator/tps65217.txt b/Documentation/devicetree/bindings/regulator/tps65217.txt new file mode 100644 index 00000000000..0487e9675ba --- /dev/null +++ b/Documentation/devicetree/bindings/regulator/tps65217.txt
@@ -0,0 +1,91 @@
		1	TPS65217 family of regulators
		2
		3	Required properties:
		4	- compatible: "ti,tps65217"
		5	- reg: I2C slave address
		6	- regulators: list of regulators provided by this controller, must be named
		7	after their hardware counterparts: dcdc[1-3] and ldo[1-4]
		8	- regulators: This is the list of child nodes that specify the regulator
		9	initialization data for defined regulators. Not all regulators for the given
		10	device need to be present. The definition for each of these nodes is defined
		11	using the standard binding for regulators found at
		12	Documentation/devicetree/bindings/regulator/regulator.txt.
		13
		14	The valid names for regulators are:
		15	tps65217: dcdc1, dcdc2, dcdc3, ldo1, ldo2, ldo3 and ldo4
		16
		17	Each regulator is defined using the standard binding for regulators.
		18
		19	Example:
		20
		21	tps: tps@24 {
		22	compatible = "ti,tps65217";
		23
		24	regulators {
		25	#address-cells = <1>;
		26	#size-cells = <0>;
		27
		28	dcdc1_reg: regulator@0 {
		29	reg = <0>;
		30	regulator-compatible = "dcdc1";
		31	regulator-min-microvolt = <900000>;
		32	regulator-max-microvolt = <1800000>;
		33	regulator-boot-on;
		34	regulator-always-on;
		35	};
		36
		37	dcdc2_reg: regulator@1 {
		38	reg = <1>;
		39	regulator-compatible = "dcdc2";
		40	regulator-min-microvolt = <900000>;
		41	regulator-max-microvolt = <3300000>;
		42	regulator-boot-on;
		43	regulator-always-on;
		44	};
		45
		46	dcdc3_reg: regulator@2 {
		47	reg = <2>;
		48	regulator-compatible = "dcdc3";
		49	regulator-min-microvolt = <900000>;
		50	regulator-max-microvolt = <1500000>;
		51	regulator-boot-on;
		52	regulator-always-on;
		53	};
		54
		55	ldo1_reg: regulator@3 {
		56	reg = <3>;
		57	regulator-compatible = "ldo1";
		58	regulator-min-microvolt = <1000000>;
		59	regulator-max-microvolt = <3300000>;
		60	regulator-boot-on;
		61	regulator-always-on;
		62	};
		63
		64	ldo2_reg: regulator@4 {
		65	reg = <4>;
		66	regulator-compatible = "ldo2";
		67	regulator-min-microvolt = <900000>;
		68	regulator-max-microvolt = <3300000>;
		69	regulator-boot-on;
		70	regulator-always-on;
		71	};
		72
		73	ldo3_reg: regulator@5 {
		74	reg = <5>;
		75	regulator-compatible = "ldo3";
		76	regulator-min-microvolt = <1800000>;
		77	regulator-max-microvolt = <3300000>;
		78	regulator-boot-on;
		79	regulator-always-on;
		80	};
		81
		82	ldo4_reg: regulator@6 {
		83	reg = <6>;
		84	regulator-compatible = "ldo4";
		85	regulator-min-microvolt = <1800000>;
		86	regulator-max-microvolt = <3300000>;
		87	regulator-boot-on;
		88	regulator-always-on;
		89	};
		90	};
		91	};


diff --git a/Documentation/devicetree/bindings/regulator/tps6586x.txt b/Documentation/devicetree/bindings/regulator/tps6586x.txt index 0fcabaa3baa..d156e1b5db1 100644 --- a/Documentation/devicetree/bindings/regulator/tps6586x.txt +++ b/Documentation/devicetree/bindings/regulator/tps6586x.txt
@@ -6,8 +6,17 @@ Required properties:
6	- interrupts: the interrupt outputs of the controller	6	- interrupts: the interrupt outputs of the controller
7	- #gpio-cells: number of cells to describe a GPIO	7	- #gpio-cells: number of cells to describe a GPIO
8	- gpio-controller: mark the device as a GPIO controller	8	- gpio-controller: mark the device as a GPIO controller
9	- regulators: list of regulators provided by this controller, must be named	9	- regulators: list of regulators provided by this controller, must have
10	after their hardware counterparts: sm[0-2], ldo[0-9] and ldo_rtc	10	property "regulator-compatible" to match their hardware counterparts:
		11	sm[0-2], ldo[0-9] and ldo_rtc
		12	- sm0-supply: The input supply for the SM0.
		13	- sm1-supply: The input supply for the SM1.
		14	- sm2-supply: The input supply for the SM2.
		15	- vinldo01-supply: The input supply for the LDO1 and LDO2
		16	- vinldo23-supply: The input supply for the LDO2 and LDO3
		17	- vinldo4-supply: The input supply for the LDO4
		18	- vinldo678-supply: The input supply for the LDO6, LDO7 and LDO8
		19	- vinldo9-supply: The input supply for the LDO9
11		20
12	Each regulator is defined using the standard binding for regulators.	21	Each regulator is defined using the standard binding for regulators.
13		22
@@ -21,75 +30,113 @@ Example:
21	#gpio-cells = <2>;	30	#gpio-cells = <2>;
22	gpio-controller;	31	gpio-controller;
23		32
		33	sm0-supply = <&some_reg>;
		34	sm1-supply = <&some_reg>;
		35	sm2-supply = <&some_reg>;
		36	vinldo01-supply = <...>;
		37	vinldo23-supply = <...>;
		38	vinldo4-supply = <...>;
		39	vinldo678-supply = <...>;
		40	vinldo9-supply = <...>;
		41
24	regulators {	42	regulators {
25	sm0_reg: sm0 {	43	#address-cells = <1>;
		44	#size-cells = <0>;
		45
		46	sm0_reg: regulator@0 {
		47	reg = <0>;
		48	regulator-compatible = "sm0";
26	regulator-min-microvolt = < 725000>;	49	regulator-min-microvolt = < 725000>;
27	regulator-max-microvolt = <1500000>;	50	regulator-max-microvolt = <1500000>;
28	regulator-boot-on;	51	regulator-boot-on;
29	regulator-always-on;	52	regulator-always-on;
30	};	53	};
31		54
32	sm1_reg: sm1 {	55	sm1_reg: regulator@1 {
		56	reg = <1>;
		57	regulator-compatible = "sm1";
33	regulator-min-microvolt = < 725000>;	58	regulator-min-microvolt = < 725000>;
34	regulator-max-microvolt = <1500000>;	59	regulator-max-microvolt = <1500000>;
35	regulator-boot-on;	60	regulator-boot-on;
36	regulator-always-on;	61	regulator-always-on;
37	};	62	};
38		63
39	sm2_reg: sm2 {	64	sm2_reg: regulator@2 {
		65	reg = <2>;
		66	regulator-compatible = "sm2";
40	regulator-min-microvolt = <3000000>;	67	regulator-min-microvolt = <3000000>;
41	regulator-max-microvolt = <4550000>;	68	regulator-max-microvolt = <4550000>;
42	regulator-boot-on;	69	regulator-boot-on;
43	regulator-always-on;	70	regulator-always-on;
44	};	71	};
45		72
46	ldo0_reg: ldo0 {	73	ldo0_reg: regulator@3 {
		74	reg = <3>;
		75	regulator-compatible = "ldo0";
47	regulator-name = "PCIE CLK";	76	regulator-name = "PCIE CLK";
48	regulator-min-microvolt = <3300000>;	77	regulator-min-microvolt = <3300000>;
49	regulator-max-microvolt = <3300000>;	78	regulator-max-microvolt = <3300000>;
50	};	79	};
51		80
52	ldo1_reg: ldo1 {	81	ldo1_reg: regulator@4 {
		82	reg = <4>;
		83	regulator-compatible = "ldo1";
53	regulator-min-microvolt = < 725000>;	84	regulator-min-microvolt = < 725000>;
54	regulator-max-microvolt = <1500000>;	85	regulator-max-microvolt = <1500000>;
55	};	86	};
56		87
57	ldo2_reg: ldo2 {	88	ldo2_reg: regulator@5 {
		89	reg = <5>;
		90	regulator-compatible = "ldo2";
58	regulator-min-microvolt = < 725000>;	91	regulator-min-microvolt = < 725000>;
59	regulator-max-microvolt = <1500000>;	92	regulator-max-microvolt = <1500000>;
60	};	93	};
61		94
62	ldo3_reg: ldo3 {	95	ldo3_reg: regulator@6 {
		96	reg = <6>;
		97	regulator-compatible = "ldo3";
63	regulator-min-microvolt = <1250000>;	98	regulator-min-microvolt = <1250000>;
64	regulator-max-microvolt = <3300000>;	99	regulator-max-microvolt = <3300000>;
65	};	100	};
66		101
67	ldo4_reg: ldo4 {	102	ldo4_reg: regulator@7 {
		103	reg = <7>;
		104	regulator-compatible = "ldo4";
68	regulator-min-microvolt = <1700000>;	105	regulator-min-microvolt = <1700000>;
69	regulator-max-microvolt = <2475000>;	106	regulator-max-microvolt = <2475000>;
70	};	107	};
71		108
72	ldo5_reg: ldo5 {	109	ldo5_reg: regulator@8 {
		110	reg = <8>;
		111	regulator-compatible = "ldo5";
73	regulator-min-microvolt = <1250000>;	112	regulator-min-microvolt = <1250000>;
74	regulator-max-microvolt = <3300000>;	113	regulator-max-microvolt = <3300000>;
75	};	114	};
76		115
77	ldo6_reg: ldo6 {	116	ldo6_reg: regulator@9 {
		117	reg = <9>;
		118	regulator-compatible = "ldo6";
78	regulator-min-microvolt = <1250000>;	119	regulator-min-microvolt = <1250000>;
79	regulator-max-microvolt = <3300000>;	120	regulator-max-microvolt = <3300000>;
80	};	121	};
81		122
82	ldo7_reg: ldo7 {	123	ldo7_reg: regulator@10 {
		124	reg = <10>;
		125	regulator-compatible = "ldo7";
83	regulator-min-microvolt = <1250000>;	126	regulator-min-microvolt = <1250000>;
84	regulator-max-microvolt = <3300000>;	127	regulator-max-microvolt = <3300000>;
85	};	128	};
86		129
87	ldo8_reg: ldo8 {	130	ldo8_reg: regulator@11 {
		131	reg = <11>;
		132	regulator-compatible = "ldo8";
88	regulator-min-microvolt = <1250000>;	133	regulator-min-microvolt = <1250000>;
89	regulator-max-microvolt = <3300000>;	134	regulator-max-microvolt = <3300000>;
90	};	135	};
91		136
92	ldo9_reg: ldo9 {	137	ldo9_reg: regulator@12 {
		138	reg = <12>;
		139	regulator-compatible = "ldo9";
93	regulator-min-microvolt = <1250000>;	140	regulator-min-microvolt = <1250000>;
94	regulator-max-microvolt = <3300000>;	141	regulator-max-microvolt = <3300000>;
95	};	142	};


diff --git a/Documentation/devicetree/bindings/regulator/twl-regulator.txt b/Documentation/devicetree/bindings/regulator/twl-regulator.txt index 0c3395d55ac..658749b90b9 100644 --- a/Documentation/devicetree/bindings/regulator/twl-regulator.txt +++ b/Documentation/devicetree/bindings/regulator/twl-regulator.txt
@@ -15,7 +15,6 @@ For twl6030 regulators/LDOs
15	- "ti,twl6030-vusb" for VUSB LDO	15	- "ti,twl6030-vusb" for VUSB LDO
16	- "ti,twl6030-v1v8" for V1V8 LDO	16	- "ti,twl6030-v1v8" for V1V8 LDO
17	- "ti,twl6030-v2v1" for V2V1 LDO	17	- "ti,twl6030-v2v1" for V2V1 LDO
18	- "ti,twl6030-clk32kg" for CLK32KG RESOURCE
19	- "ti,twl6030-vdd1" for VDD1 SMPS	18	- "ti,twl6030-vdd1" for VDD1 SMPS
20	- "ti,twl6030-vdd2" for VDD2 SMPS	19	- "ti,twl6030-vdd2" for VDD2 SMPS
21	- "ti,twl6030-vdd3" for VDD3 SMPS	20	- "ti,twl6030-vdd3" for VDD3 SMPS