aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/devicetree/bindings/regulator/da9211.txt82
-rw-r--r--Documentation/devicetree/bindings/regulator/pfuze100.txt6
-rw-r--r--drivers/regulator/Kconfig2
-rw-r--r--drivers/regulator/da9211-regulator.c14
-rw-r--r--drivers/regulator/da9211-regulator.h2
-rw-r--r--drivers/regulator/tps65218-regulator.c2
-rw-r--r--include/linux/mfd/tps65218.h19
-rw-r--r--include/linux/regulator/da9211.h5
8 files changed, 95 insertions, 37 deletions
diff --git a/Documentation/devicetree/bindings/regulator/da9211.txt b/Documentation/devicetree/bindings/regulator/da9211.txt
index 0f2a6f8fcafd..27717e816e71 100644
--- a/Documentation/devicetree/bindings/regulator/da9211.txt
+++ b/Documentation/devicetree/bindings/regulator/da9211.txt
@@ -1,8 +1,9 @@
1* Dialog Semiconductor DA9211/DA9212/DA9213/DA9214/DA9215 Voltage Regulator 1* Dialog Semiconductor DA9211/DA9212/DA9213/DA9223/DA9214/DA9224/DA9215/DA9225
2 Voltage Regulator
2 3
3Required properties: 4Required properties:
4- compatible: "dlg,da9211" or "dlg,da9212" or "dlg,da9213" 5- compatible: "dlg,da9211" or "dlg,da9212" or "dlg,da9213" or "dlg,da9223"
5 or "dlg,da9214" or "dlg,da9215" 6 or "dlg,da9214" or "dlg,da9224" or "dlg,da9215" or "dlg,da9225"
6- reg: I2C slave address, usually 0x68. 7- reg: I2C slave address, usually 0x68.
7- interrupts: the interrupt outputs of the controller 8- interrupts: the interrupt outputs of the controller
8- regulators: A node that houses a sub-node for each regulator within the 9- regulators: A node that houses a sub-node for each regulator within the
@@ -16,7 +17,6 @@ Optional properties:
16- Any optional property defined in regulator.txt 17- Any optional property defined in regulator.txt
17 18
18Example 1) DA9211 19Example 1) DA9211
19
20 pmic: da9211@68 { 20 pmic: da9211@68 {
21 compatible = "dlg,da9211"; 21 compatible = "dlg,da9211";
22 reg = <0x68>; 22 reg = <0x68>;
@@ -35,7 +35,6 @@ Example 1) DA9211
35 }; 35 };
36 36
37Example 2) DA9212 37Example 2) DA9212
38
39 pmic: da9212@68 { 38 pmic: da9212@68 {
40 compatible = "dlg,da9212"; 39 compatible = "dlg,da9212";
41 reg = <0x68>; 40 reg = <0x68>;
@@ -79,7 +78,25 @@ Example 3) DA9213
79 }; 78 };
80 }; 79 };
81 80
82Example 4) DA9214 81Example 4) DA9223
82 pmic: da9223@68 {
83 compatible = "dlg,da9223";
84 reg = <0x68>;
85 interrupts = <3 27>;
86
87 regulators {
88 BUCKA {
89 regulator-name = "VBUCKA";
90 regulator-min-microvolt = < 300000>;
91 regulator-max-microvolt = <1570000>;
92 regulator-min-microamp = <3000000>;
93 regulator-max-microamp = <6000000>;
94 enable-gpios = <&gpio 27 0>;
95 };
96 };
97 };
98
99Example 5) DA9214
83 pmic: da9214@68 { 100 pmic: da9214@68 {
84 compatible = "dlg,da9214"; 101 compatible = "dlg,da9214";
85 reg = <0x68>; 102 reg = <0x68>;
@@ -105,7 +122,33 @@ Example 4) DA9214
105 }; 122 };
106 }; 123 };
107 124
108Example 5) DA9215 125Example 6) DA9224
126 pmic: da9224@68 {
127 compatible = "dlg,da9224";
128 reg = <0x68>;
129 interrupts = <3 27>;
130
131 regulators {
132 BUCKA {
133 regulator-name = "VBUCKA";
134 regulator-min-microvolt = < 300000>;
135 regulator-max-microvolt = <1570000>;
136 regulator-min-microamp = <3000000>;
137 regulator-max-microamp = <6000000>;
138 enable-gpios = <&gpio 27 0>;
139 };
140 BUCKB {
141 regulator-name = "VBUCKB";
142 regulator-min-microvolt = < 300000>;
143 regulator-max-microvolt = <1570000>;
144 regulator-min-microamp = <3000000>;
145 regulator-max-microamp = <6000000>;
146 enable-gpios = <&gpio 17 0>;
147 };
148 };
149 };
150
151Example 7) DA9215
109 pmic: da9215@68 { 152 pmic: da9215@68 {
110 compatible = "dlg,da9215"; 153 compatible = "dlg,da9215";
111 reg = <0x68>; 154 reg = <0x68>;
@@ -131,3 +174,28 @@ Example 5) DA9215
131 }; 174 };
132 }; 175 };
133 176
177Example 8) DA9225
178 pmic: da9225@68 {
179 compatible = "dlg,da9225";
180 reg = <0x68>;
181 interrupts = <3 27>;
182
183 regulators {
184 BUCKA {
185 regulator-name = "VBUCKA";
186 regulator-min-microvolt = < 300000>;
187 regulator-max-microvolt = <1570000>;
188 regulator-min-microamp = <4000000>;
189 regulator-max-microamp = <7000000>;
190 enable-gpios = <&gpio 27 0>;
191 };
192 BUCKB {
193 regulator-name = "VBUCKB";
194 regulator-min-microvolt = < 300000>;
195 regulator-max-microvolt = <1570000>;
196 regulator-min-microamp = <4000000>;
197 regulator-max-microamp = <7000000>;
198 enable-gpios = <&gpio 17 0>;
199 };
200 };
201 };
diff --git a/Documentation/devicetree/bindings/regulator/pfuze100.txt b/Documentation/devicetree/bindings/regulator/pfuze100.txt
index 444c47831a40..c6dd3f5e485b 100644
--- a/Documentation/devicetree/bindings/regulator/pfuze100.txt
+++ b/Documentation/devicetree/bindings/regulator/pfuze100.txt
@@ -21,7 +21,7 @@ Each regulator is defined using the standard binding for regulators.
21 21
22Example 1: PFUZE100 22Example 1: PFUZE100
23 23
24 pmic: pfuze100@08 { 24 pmic: pfuze100@8 {
25 compatible = "fsl,pfuze100"; 25 compatible = "fsl,pfuze100";
26 reg = <0x08>; 26 reg = <0x08>;
27 27
@@ -122,7 +122,7 @@ Example 1: PFUZE100
122 122
123Example 2: PFUZE200 123Example 2: PFUZE200
124 124
125 pmic: pfuze200@08 { 125 pmic: pfuze200@8 {
126 compatible = "fsl,pfuze200"; 126 compatible = "fsl,pfuze200";
127 reg = <0x08>; 127 reg = <0x08>;
128 128
@@ -216,7 +216,7 @@ Example 2: PFUZE200
216 216
217Example 3: PFUZE3000 217Example 3: PFUZE3000
218 218
219 pmic: pfuze3000@08 { 219 pmic: pfuze3000@8 {
220 compatible = "fsl,pfuze3000"; 220 compatible = "fsl,pfuze3000";
221 reg = <0x08>; 221 reg = <0x08>;
222 222
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 0fd6195601ba..96cd55f9e3c5 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -244,7 +244,7 @@ config REGULATOR_DA9210
244 interface. 244 interface.
245 245
246config REGULATOR_DA9211 246config REGULATOR_DA9211
247 tristate "Dialog Semiconductor DA9211/DA9212/DA9213/DA9214/DA9215 regulator" 247 tristate "Dialog Semiconductor DA9211/DA9212/DA9213/DA9223/DA9214/DA9224/DA9215/DA9225 regulator"
248 depends on I2C 248 depends on I2C
249 select REGMAP_I2C 249 select REGMAP_I2C
250 help 250 help
diff --git a/drivers/regulator/da9211-regulator.c b/drivers/regulator/da9211-regulator.c
index aa47280efd32..9b8f47617724 100644
--- a/