diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2014-02-07 10:18:30 -0500 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2014-02-09 08:32:30 -0500 |
commit | 352d318cc9136d5be9c41e9fb235afc0822a375e (patch) | |
tree | 233e60d25f57a7621e57a52ca9cbb9eb98bb853b /arch/arm/boot/dts | |
parent | a4a2aa9b038c3285ca4c3f2a746b1950d66f5fa9 (diff) |
ARM: dts: imx: use generic node name for fixed regulator
The device tree specification recommends that generic name should be
used for nodes. So instead of naming those fixed regulator nodes
arbitrarily, let's use the generic name 'regulator@num' for those nodes.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r-- | arch/arm/boot/dts/imx23-evk.dts | 8 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx23-olinuxino.dts | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx23-stmp378x_devb.dts | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx28-apf28dev.dts | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx28-apx4devkit.dts | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx28-cfa10037.dts | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx28-cfa10049.dts | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx28-cfa10057.dts | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx28-cfa10058.dts | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx28-evk.dts | 23 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx28-m28cu3.dts | 14 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx28-m28evk.dts | 14 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx28-sps1.dts | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx28-tx28.dts | 23 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx53-ard.dts | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx53-m53evk.dts | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx53-mba53.dts | 8 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx53-qsb.dts | 8 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx53-tqma53.dtsi | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx53-tx53.dtsi | 5 |
21 files changed, 126 insertions, 42 deletions
diff --git a/arch/arm/boot/dts/imx23-evk.dts b/arch/arm/boot/dts/imx23-evk.dts index 1f026adefd45..a33f66c11b73 100644 --- a/arch/arm/boot/dts/imx23-evk.dts +++ b/arch/arm/boot/dts/imx23-evk.dts | |||
@@ -127,17 +127,21 @@ | |||
127 | 127 | ||
128 | regulators { | 128 | regulators { |
129 | compatible = "simple-bus"; | 129 | compatible = "simple-bus"; |
130 | #address-cells = <1>; | ||
131 | #size-cells = <0>; | ||
130 | 132 | ||
131 | reg_vddio_sd0: vddio-sd0 { | 133 | reg_vddio_sd0: regulator@0 { |
132 | compatible = "regulator-fixed"; | 134 | compatible = "regulator-fixed"; |
135 | reg = <0>; | ||
133 | regulator-name = "vddio-sd0"; | 136 | regulator-name = "vddio-sd0"; |
134 | regulator-min-microvolt = <3300000>; | 137 | regulator-min-microvolt = <3300000>; |
135 | regulator-max-microvolt = <3300000>; | 138 | regulator-max-microvolt = <3300000>; |
136 | gpio = <&gpio1 29 0>; | 139 | gpio = <&gpio1 29 0>; |
137 | }; | 140 | }; |
138 | 141 | ||
139 | reg_lcd_3v3: lcd-3v3 { | 142 | reg_lcd_3v3: regulator@1 { |
140 | compatible = "regulator-fixed"; | 143 | compatible = "regulator-fixed"; |
144 | reg = <1>; | ||
141 | regulator-name = "lcd-3v3"; | 145 | regulator-name = "lcd-3v3"; |
142 | regulator-min-microvolt = <3300000>; | 146 | regulator-min-microvolt = <3300000>; |
143 | regulator-max-microvolt = <3300000>; | 147 | regulator-max-microvolt = <3300000>; |
diff --git a/arch/arm/boot/dts/imx23-olinuxino.dts b/arch/arm/boot/dts/imx23-olinuxino.dts index 526bfdbd87f9..7e6eef2488e8 100644 --- a/arch/arm/boot/dts/imx23-olinuxino.dts +++ b/arch/arm/boot/dts/imx23-olinuxino.dts | |||
@@ -100,9 +100,12 @@ | |||
100 | 100 | ||
101 | regulators { | 101 | regulators { |
102 | compatible = "simple-bus"; | 102 | compatible = "simple-bus"; |
103 | #address-cells = <1>; | ||
104 | #size-cells = <0>; | ||
103 | 105 | ||
104 | reg_usb0_vbus: usb0_vbus { | 106 | reg_usb0_vbus: regulator@0 { |
105 | compatible = "regulator-fixed"; | 107 | compatible = "regulator-fixed"; |
108 | reg = <0>; | ||
106 | regulator-name = "usb0_vbus"; | 109 | regulator-name = "usb0_vbus"; |
107 | regulator-min-microvolt = <5000000>; | 110 | regulator-min-microvolt = <5000000>; |
108 | regulator-max-microvolt = <5000000>; | 111 | regulator-max-microvolt = <5000000>; |
diff --git a/arch/arm/boot/dts/imx23-stmp378x_devb.dts b/arch/arm/boot/dts/imx23-stmp378x_devb.dts index cb64e2b191ea..455169e99d49 100644 --- a/arch/arm/boot/dts/imx23-stmp378x_devb.dts +++ b/arch/arm/boot/dts/imx23-stmp378x_devb.dts | |||
@@ -66,9 +66,12 @@ | |||
66 | 66 | ||
67 | regulators { | 67 | regulators { |
68 | compatible = "simple-bus"; | 68 | compatible = "simple-bus"; |
69 | #address-cells = <1>; | ||
70 | #size-cells = <0>; | ||
69 | 71 | ||
70 | reg_vddio_sd0: vddio-sd0 { | 72 | reg_vddio_sd0: regulator@0 { |
71 | compatible = "regulator-fixed"; | 73 | compatible = "regulator-fixed"; |
74 | reg = <0>; | ||
72 | regulator-name = "vddio-sd0"; | 75 | regulator-name = "vddio-sd0"; |
73 | regulator-min-microvolt = <3300000>; | 76 | regulator-min-microvolt = <3300000>; |
74 | regulator-max-microvolt = <3300000>; | 77 | regulator-max-microvolt = <3300000>; |
diff --git a/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts b/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts index 5a31c776513f..9e2fe99988a6 100644 --- a/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts +++ b/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts | |||
@@ -37,9 +37,12 @@ | |||
37 | 37 | ||
38 | regulators { | 38 | regulators { |
39 | compatible = "simple-bus"; | 39 | compatible = "simple-bus"; |
40 | #address-cells = <1>; | ||
41 | #size-cells = <0>; | ||
40 | 42 | ||
41 | reg_3v3: 3v3 { | 43 | reg_3v3: regulator@0 { |
42 | compatible = "regulator-fixed"; | 44 | compatible = "regulator-fixed"; |
45 | reg = <0>; | ||
43 | regulator-name = "3V3"; | 46 | regulator-name = "3V3"; |
44 | regulator-min-microvolt = <3300000>; | 47 | regulator-min-microvolt = <3300000>; |
45 | regulator-max-microvolt = <3300000>; | 48 | regulator-max-microvolt = <3300000>; |
diff --git a/arch/arm/boot/dts/imx28-apf28dev.dts b/arch/arm/boot/dts/imx28-apf28dev.dts index e2efd8d89c4f..741aecbf0b32 100644 --- a/arch/arm/boot/dts/imx28-apf28dev.dts +++ b/arch/arm/boot/dts/imx28-apf28dev.dts | |||
@@ -150,9 +150,12 @@ | |||
150 | 150 | ||
151 | regulators { | 151 | regulators { |
152 | compatible = "simple-bus"; | 152 | compatible = "simple-bus"; |
153 | #address-cells = <1>; | ||
154 | #size-cells = <0>; | ||
153 | 155 | ||
154 | reg_usb0_vbus: usb0_vbus { | 156 | reg_usb0_vbus: regulator@0 { |
155 | compatible = "regulator-fixed"; | 157 | compatible = "regulator-fixed"; |
158 | reg = <0>; | ||
156 | regulator-name = "usb0_vbus"; | 159 | regulator-name = "usb0_vbus"; |
157 | regulator-min-microvolt = <5000000>; | 160 | regulator-min-microvolt = <5000000>; |
158 | regulator-max-microvolt = <5000000>; | 161 | regulator-max-microvolt = <5000000>; |
diff --git a/arch/arm/boot/dts/imx28-apx4devkit.dts b/arch/arm/boot/dts/imx28-apx4devkit.dts index 6f254ca816cb..e1ce9179db63 100644 --- a/arch/arm/boot/dts/imx28-apx4devkit.dts +++ b/arch/arm/boot/dts/imx28-apx4devkit.dts | |||
@@ -193,9 +193,12 @@ | |||
193 | 193 | ||
194 | regulators { | 194 | regulators { |
195 | compatible = "simple-bus"; | 195 | compatible = "simple-bus"; |
196 | #address-cells = <1>; | ||
197 | #size-cells = <0>; | ||
196 | 198 | ||
197 | reg_3p3v: 3p3v { | 199 | reg_3p3v: regulator@0 { |
198 | compatible = "regulator-fixed"; | 200 | compatible = "regulator-fixed"; |
201 | reg = <0>; | ||
199 | regulator-name = "3P3V"; | 202 | regulator-name = "3P3V"; |
200 | regulator-min-microvolt = <3300000>; | 203 | regulator-min-microvolt = <3300000>; |
201 | regulator-max-microvolt = <3300000>; | 204 | regulator-max-microvolt = <3300000>; |
diff --git a/arch/arm/boot/dts/imx28-cfa10037.dts b/arch/arm/boot/dts/imx28-cfa10037.dts index f93e9a700e52..6729872ffe9a 100644 --- a/arch/arm/boot/dts/imx28-cfa10037.dts +++ b/arch/arm/boot/dts/imx28-cfa10037.dts | |||
@@ -72,9 +72,12 @@ | |||
72 | 72 | ||
73 | regulators { | 73 | regulators { |
74 | compatible = "simple-bus"; | 74 | compatible = "simple-bus"; |
75 | #address-cells = <1>; | ||
76 | #size-cells = <0>; | ||
75 | 77 | ||
76 | reg_usb1_vbus: usb1_vbus { | 78 | reg_usb1_vbus: regulator@0 { |
77 | compatible = "regulator-fixed"; | 79 | compatible = "regulator-fixed"; |
80 | reg = <0>; | ||
78 | pinctrl-names = "default"; | 81 | pinctrl-names = "default"; |
79 | pinctrl-0 = <&usb_pins_cfa10037>; | 82 | pinctrl-0 = <&usb_pins_cfa10037>; |
80 | regulator-name = "usb1_vbus"; | 83 | regulator-name = "usb1_vbus"; |
diff --git a/arch/arm/boot/dts/imx28-cfa10049.dts b/arch/arm/boot/dts/imx28-cfa10049.dts index 7087b4bf6a8f..28ef91ac17ac 100644 --- a/arch/arm/boot/dts/imx28-cfa10049.dts +++ b/arch/arm/boot/dts/imx28-cfa10049.dts | |||
@@ -282,9 +282,12 @@ | |||
282 | 282 | ||
283 | regulators { | 283 | regulators { |
284 | compatible = "simple-bus"; | 284 | compatible = "simple-bus"; |
285 | #address-cells = <1>; | ||
286 | #size-cells = <0>; | ||
285 | 287 | ||
286 | reg_usb1_vbus: usb1_vbus { | 288 | reg_usb1_vbus: regulator@0 { |
287 | compatible = "regulator-fixed"; | 289 | compatible = "regulator-fixed"; |
290 | reg = <0>; | ||
288 | pinctrl-names = "default"; | 291 | pinctrl-names = "default"; |
289 | pinctrl-0 = <&usb_pins_cfa10049>; | 292 | pinctrl-0 = <&usb_pins_cfa10049>; |
290 | regulator-name = "usb1_vbus"; | 293 | regulator-name = "usb1_vbus"; |
diff --git a/arch/arm/boot/dts/imx28-cfa10057.dts b/arch/arm/boot/dts/imx28-cfa10057.dts index 3c1312885ae0..1ebd44edaf8d 100644 --- a/arch/arm/boot/dts/imx28-cfa10057.dts +++ b/arch/arm/boot/dts/imx28-cfa10057.dts | |||
@@ -142,9 +142,12 @@ | |||
142 | 142 | ||
143 | regulators { | 143 | regulators { |
144 | compatible = "simple-bus"; | 144 | compatible = "simple-bus"; |
145 | #address-cells = <1>; | ||
146 | #size-cells = <0>; | ||
145 | 147 | ||
146 | reg_usb1_vbus: usb1_vbus { | 148 | reg_usb1_vbus: regulator@0 { |
147 | compatible = "regulator-fixed"; | 149 | compatible = "regulator-fixed"; |
150 | reg = <0>; | ||
148 | pinctrl-names = "default"; | 151 | pinctrl-names = "default"; |
149 | pinctrl-0 = <&usb_pins_cfa10057>; | 152 | pinctrl-0 = <&usb_pins_cfa10057>; |
150 | regulator-name = "usb1_vbus"; | 153 | regulator-name = "usb1_vbus"; |
diff --git a/arch/arm/boot/dts/imx28-cfa10058.dts b/arch/arm/boot/dts/imx28-cfa10058.dts index 2469d34df0ae..a4f0acb93437 100644 --- a/arch/arm/boot/dts/imx28-cfa10058.dts +++ b/arch/arm/boot/dts/imx28-cfa10058.dts | |||
@@ -109,11 +109,14 @@ | |||
109 | 109 | ||
110 | regulators { | 110 | regulators { |
111 | compatible = "simple-bus"; | 111 | compatible = "simple-bus"; |
112 | #address-cells = <1>; | ||
113 | #size-cells = <0>; | ||
112 | 114 | ||
113 | reg_usb1_vbus: usb1_vbus { | 115 | reg_usb1_vbus: regulator@0 { |
114 | pinctrl-names = "default"; | 116 | pinctrl-names = "default"; |
115 | pinctrl-0 = <&usb_pins_cfa10058>; | 117 | pinctrl-0 = <&usb_pins_cfa10058>; |
116 | compatible = "regulator-fixed"; | 118 | compatible = "regulator-fixed"; |
119 | reg = <0>; | ||
117 | regulator-name = "usb1_vbus"; | 120 | regulator-name = "usb1_vbus"; |
118 | regulator-min-microvolt = <5000000>; | 121 | regulator-min-microvolt = <5000000>; |
119 | regulator-max-microvolt = <5000000>; | 122 | regulator-max-microvolt = <5000000>; |
diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts index 4267c2b05d60..41a983405e7d 100644 --- a/arch/arm/boot/dts/imx28-evk.dts +++ b/arch/arm/boot/dts/imx28-evk.dts | |||
@@ -278,33 +278,39 @@ | |||
278 | 278 | ||
279 | regulators { | 279 | regulators { |
280 | compatible = "simple-bus"; | 280 | compatible = "simple-bus"; |
281 | #address-cells = <1>; | ||
282 | #size-cells = <0>; | ||
281 | 283 | ||
282 | reg_3p3v: 3p3v { | 284 | reg_3p3v: regulator@0 { |
283 | compatible = "regulator-fixed"; | 285 | compatible = "regulator-fixed"; |
286 | reg = <0>; | ||
284 | regulator-name = "3P3V"; | 287 | regulator-name = "3P3V"; |
285 | regulator-min-microvolt = <3300000>; | 288 | regulator-min-microvolt = <3300000>; |
286 | regulator-max-microvolt = <3300000>; | 289 | regulator-max-microvolt = <3300000>; |
287 | regulator-always-on; | 290 | regulator-always-on; |
288 | }; | 291 | }; |
289 | 292 | ||
290 | reg_vddio_sd0: vddio-sd0 { | 293 | reg_vddio_sd0: regulator@1 { |
291 | compatible = "regulator-fixed"; | 294 | compatible = "regulator-fixed"; |
295 | reg = <1>; | ||
292 | regulator-name = "vddio-sd0"; | 296 | regulator-name = "vddio-sd0"; |
293 | regulator-min-microvolt = <3300000>; | 297 | regulator-min-microvolt = <3300000>; |
294 | regulator-max-microvolt = <3300000>; | 298 | regulator-max-microvolt = <3300000>; |
295 | gpio = <&gpio3 28 0>; | 299 | gpio = <&gpio3 28 0>; |
296 | }; | 300 | }; |
297 | 301 | ||
298 | reg_fec_3v3: fec-3v3 { | 302 | reg_fec_3v3: regulator@2 { |
299 | compatible = "regulator-fixed"; | 303 | compatible = "regulator-fixed"; |
304 | reg = <2>; | ||
300 | regulator-name = "fec-3v3"; | 305 | regulator-name = "fec-3v3"; |
301 | regulator-min-microvolt = <3300000>; | 306 | regulator-min-microvolt = <3300000>; |
302 | regulator-max-microvolt = <3300000>; | 307 | regulator-max-microvolt = <3300000>; |
303 | gpio = <&gpio2 15 0>; | 308 | gpio = <&gpio2 15 0>; |
304 | }; | 309 | }; |
305 | 310 | ||
306 | reg_usb0_vbus: usb0_vbus { | 311 | reg_usb0_vbus: regulator@3 { |
307 | compatible = "regulator-fixed"; | 312 | compatible = "regulator-fixed"; |
313 | reg = <3>; | ||
308 | regulator-name = "usb0_vbus"; | 314 | regulator-name = "usb0_vbus"; |
309 | regulator-min-microvolt = <5000000>; | 315 | regulator-min-microvolt = <5000000>; |
310 | regulator-max-microvolt = <5000000>; | 316 | regulator-max-microvolt = <5000000>; |
@@ -312,8 +318,9 @@ | |||
312 | enable-active-high; | 318 | enable-active-high; |
313 | }; | 319 | }; |
314 | 320 | ||
315 | reg_usb1_vbus: usb1_vbus { | 321 | reg_usb1_vbus: regulator@4 { |
316 | compatible = "regulator-fixed"; | 322 | compatible = "regulator-fixed"; |
323 | reg = <4>; | ||
317 | regulator-name = "usb1_vbus"; | 324 | regulator-name = "usb1_vbus"; |
318 | regulator-min-microvolt = <5000000>; | 325 | regulator-min-microvolt = <5000000>; |
319 | regulator-max-microvolt = <5000000>; | 326 | regulator-max-microvolt = <5000000>; |
@@ -321,8 +328,9 @@ | |||
321 | enable-active-high; | 328 | enable-active-high; |
322 | }; | 329 | }; |
323 | 330 | ||
324 | reg_lcd_3v3: lcd-3v3 { | 331 | reg_lcd_3v3: regulator@5 { |
325 | compatible = "regulator-fixed"; | 332 | compatible = "regulator-fixed"; |
333 | reg = <5>; | ||
326 | regulator-name = "lcd-3v3"; | 334 | regulator-name = "lcd-3v3"; |
327 | regulator-min-microvolt = <3300000>; | 335 | regulator-min-microvolt = <3300000>; |
328 | regulator-max-microvolt = <3300000>; | 336 | regulator-max-microvolt = <3300000>; |
@@ -330,8 +338,9 @@ | |||
330 | enable-active-high; | 338 | enable-active-high; |
331 | }; | 339 | }; |
332 | 340 | ||
333 | reg_can_3v3: can-3v3 { | 341 | reg_can_3v3: regulator@6 { |
334 | compatible = "regulator-fixed"; | 342 | compatible = "regulator-fixed"; |
343 | reg = <6>; | ||
335 | regulator-name = "can-3v3"; | 344 | regulator-name = "can-3v3"; |
336 | regulator-min-microvolt = <3300000>; | 345 | regulator-min-microvolt = <3300000>; |
337 | regulator-max-microvolt = <3300000>; | 346 | regulator-max-microvolt = <3300000>; |
diff --git a/arch/arm/boot/dts/imx28-m28cu3.dts b/arch/arm/boot/dts/imx28-m28cu3.dts index d3958da60bd7..d6e71ed3147b 100644 --- a/arch/arm/boot/dts/imx28-m28cu3.dts +++ b/arch/arm/boot/dts/imx28-m28cu3.dts | |||
@@ -229,33 +229,39 @@ | |||
229 | 229 | ||
230 | regulators { | 230 | regulators { |
231 | compatible = "simple-bus"; | 231 | compatible = "simple-bus"; |
232 | #address-cells = <1>; | ||
233 | #size-cells = <0>; | ||
232 | 234 | ||
233 | reg_3p3v: 3p3v { | 235 | reg_3p3v: regulator@0 { |
234 | compatible = "regulator-fixed"; | 236 | compatible = "regulator-fixed"; |
237 | reg = <0>; | ||
235 | regulator-name = "3P3V"; | 238 | regulator-name = "3P3V"; |
236 | regulator-min-microvolt = <3300000>; | 239 | regulator-min-microvolt = <3300000>; |
237 | regulator-max-microvolt = <3300000>; | 240 | regulator-max-microvolt = <3300000>; |
238 | regulator-always-on; | 241 | regulator-always-on; |
239 | }; | 242 | }; |
240 | 243 | ||
241 | reg_vddio_sd0: vddio-sd0 { | 244 | reg_vddio_sd0: regulator@1 { |
242 | compatible = "regulator-fixed"; | 245 | compatible = "regulator-fixed"; |
246 | reg = <1>; | ||
243 | regulator-name = "vddio-sd0"; | 247 | regulator-name = "vddio-sd0"; |
244 | regulator-min-microvolt = <3300000>; | 248 | regulator-min-microvolt = <3300000>; |
245 | regulator-max-microvolt = <3300000>; | 249 | regulator-max-microvolt = <3300000>; |
246 | gpio = <&gpio3 29 0>; | 250 | gpio = <&gpio3 29 0>; |
247 | }; | 251 | }; |
248 | 252 | ||
249 | reg_vddio_sd1: vddio-sd1 { | 253 | reg_vddio_sd1: regulator@2 { |
250 | compatible = "regulator-fixed"; | 254 | compatible = "regulator-fixed"; |
255 | reg = <2>; | ||
251 | regulator-name = "vddio-sd1"; | 256 | regulator-name = "vddio-sd1"; |
252 | regulator-min-microvolt = <3300000>; | 257 | regulator-min-microvolt = <3300000>; |
253 | regulator-max-microvolt = <3300000>; | 258 | regulator-max-microvolt = <3300000>; |
254 | gpio = <&gpio2 19 0>; | 259 | gpio = <&gpio2 19 0>; |
255 | }; | 260 | }; |
256 | 261 | ||
257 | reg_usb1_vbus: usb1_vbus { | 262 | reg_usb1_vbus: regulator@3 { |
258 | compatible = "regulator-fixed"; | 263 | compatible = "regulator-fixed"; |
264 | reg = <3>; | ||
259 | regulator-name = "usb1_vbus"; | 265 | regulator-name = "usb1_vbus"; |
260 | regulator-min-microvolt = <5000000>; | 266 | regulator-min-microvolt = <5000000>; |
261 | regulator-max-microvolt = <5000000>; | 267 | regulator-max-microvolt = <5000000>; |
diff --git a/arch/arm/boot/dts/imx28-m28evk.dts b/arch/arm/boot/dts/imx28-m28evk.dts index 8e2477fbe1d7..e6d0fa69973e 100644 --- a/arch/arm/boot/dts/imx28-m28evk.dts +++ b/arch/arm/boot/dts/imx28-m28evk.dts | |||
@@ -285,33 +285,39 @@ | |||
285 | 285 | ||
286 | regulators { | 286 | regulators { |
287 | compatible = "simple-bus"; | 287 | compatible = "simple-bus"; |
288 | #address-cells = <1>; | ||
289 | #size-cells = <0>; | ||
288 | 290 | ||
289 | reg_3p3v: 3p3v { | 291 | reg_3p3v: regulator@0 { |
290 | compatible = "regulator-fixed"; | 292 | compatible = "regulator-fixed"; |
293 | reg = <0>; | ||
291 | regulator-name = "3P3V"; | 294 | regulator-name = "3P3V"; |
292 | regulator-min-microvolt = <3300000>; | 295 | regulator-min-microvolt = <3300000>; |
293 | regulator-max-microvolt = <3300000>; | 296 | regulator-max-microvolt = <3300000>; |
294 | regulator-always-on; | 297 | regulator-always-on; |
295 | }; | 298 | }; |
296 | 299 | ||
297 | reg_vddio_sd0: vddio-sd0 { | 300 | reg_vddio_sd0: regulator@1 { |
298 | compatible = "regulator-fixed"; | 301 | compatible = "regulator-fixed"; |
302 | reg = <1>; | ||
299 | regulator-name = "vddio-sd0"; | 303 | regulator-name = "vddio-sd0"; |
300 | regulator-min-microvolt = <3300000>; | 304 | regulator-min-microvolt = <3300000>; |
301 | regulator-max-microvolt = <3300000>; | 305 | regulator-max-microvolt = <3300000>; |
302 | gpio = <&gpio3 28 0>; | 306 | gpio = <&gpio3 28 0>; |
303 | }; | 307 | }; |
304 | 308 | ||
305 | reg_usb0_vbus: usb0_vbus { | 309 | reg_usb0_vbus: regulator@2 { |
306 | compatible = "regulator-fixed"; | 310 | compatible = "regulator-fixed"; |
311 | reg = <2>; | ||
307 | regulator-name = "usb0_vbus"; | 312 | regulator-name = "usb0_vbus"; |
308 | regulator-min-microvolt = <5000000>; | 313 | regulator-min-microvolt = <5000000>; |
309 | regulator-max-microvolt = <5000000>; | 314 | regulator-max-microvolt = <5000000>; |
310 | gpio = <&gpio3 12 0>; | 315 | gpio = <&gpio3 12 0>; |
311 | }; | 316 | }; |
312 | 317 | ||
313 | reg_usb1_vbus: usb1_vbus { | 318 | reg_usb1_vbus: regulator@3 { |
314 | compatible = "regulator-fixed"; | 319 | compatible = "regulator-fixed"; |
320 | reg = <3>; | ||
315 | regulator-name = "usb1_vbus"; | 321 | regulator-name = "usb1_vbus"; |
316 | regulator-min-microvolt = <5000000>; | 322 | regulator-min-microvolt = <5000000>; |
317 | regulator-max-microvolt = <5000000>; | 323 | regulator-max-microvolt = <5000000>; |
diff --git a/arch/arm/boot/dts/imx28-sps1.dts b/arch/arm/boot/dts/imx28-sps1.dts index 4870f07bf56a..2612a01e8da9 100644 --- a/arch/arm/boot/dts/imx28-sps1.dts +++ b/arch/arm/boot/dts/imx28-sps1.dts | |||
@@ -127,9 +127,12 @@ | |||
127 | 127 | ||
128 | regulators { | 128 | regulators { |
129 | compatible = "simple-bus"; | 129 | compatible = "simple-bus"; |
130 | #address-cells = <1>; | ||
131 | #size-cells = <0>; | ||
130 | 132 | ||
131 | reg_usb0_vbus: usb0_vbus { | 133 | reg_usb0_vbus: regulator@0 { |
132 | compatible = "regulator-fixed"; | 134 | compatible = "regulator-fixed"; |
135 | reg = <0>; | ||
133 | regulator-name = "usb0_vbus"; | 136 | regulator-name = "usb0_vbus"; |
134 | regulator-min-microvolt = <5000000>; | 137 | regulator-min-microvolt = <5000000>; |
135 | regulator-max-microvolt = <5000000>; | 138 | regulator-max-microvolt = <5000000>; |
diff --git a/arch/arm/boot/dts/imx28-tx28.dts b/arch/arm/boot/dts/imx28-tx28.dts index be5a0550d58c..3c54e8d152e6 100644 --- a/arch/arm/boot/dts/imx28-tx28.dts +++ b/arch/arm/boot/dts/imx28-tx28.dts | |||
@@ -43,9 +43,12 @@ | |||
43 | 43 | ||
44 | regulators { | 44 | regulators { |
45 | compatible = "simple-bus"; | 45 | compatible = "simple-bus"; |
46 | #address-cells = <1>; | ||
47 | #size-cells = <0>; | ||
46 | 48 | ||
47 | reg_usb0_vbus: usb0_vbus { | 49 | reg_usb0_vbus: regulator@0 { |
48 | compatible = "regulator-fixed"; | 50 | compatible = "regulator-fixed"; |
51 | reg = <0>; | ||
49 | regulator-name = "usb0_vbus"; | 52 | regulator-name = "usb0_vbus"; |
50 | regulator-min-microvolt = <5000000>; | 53 | regulator-min-microvolt = <5000000>; |
51 | regulator-max-microvolt = <5000000>; | 54 | regulator-max-microvolt = <5000000>; |
@@ -53,8 +56,9 @@ | |||
53 | enable-active-high; | 56 | enable-active-high; |
54 | }; | 57 | }; |
55 | 58 | ||
56 | reg_usb1_vbus: usb1_vbus { | 59 | reg_usb1_vbus: regulator@1 { |
57 | compatible = "regulator-fixed"; | 60 | compatible = "regulator-fixed"; |
61 | reg = <1>; | ||
58 | regulator-name = "usb1_vbus"; | 62 | regulator-name = "usb1_vbus"; |
59 | regulator-min-microvolt = <5000000>; | 63 | regulator-min-microvolt = <5000000>; |
60 | regulator-max-microvolt = <5000000>; | 64 | regulator-max-microvolt = <5000000>; |
@@ -62,24 +66,27 @@ | |||
62 | enable-active-high; | 66 | enable-active-high; |
63 | }; | 67 | }; |
64 | 68 | ||
65 | reg_2p5v: 2p5v { | 69 | reg_2p5v: regulator@2 { |
66 | compatible = "regulator-fixed"; | 70 | compatible = "regulator-fixed"; |
71 | reg = <2>; | ||
67 | regulator-name = "2P5V"; | 72 | regulator-name = "2P5V"; |
68 | regulator-min-microvolt = <2500000>; | 73 | regulator-min-microvolt = <2500000>; |
69 | regulator-max-microvolt = <2500000>; | 74 | regulator-max-microvolt = <2500000>; |
70 | regulator-always-on; | 75 | regulator-always-on; |
71 | }; | 76 | }; |
72 | 77 | ||
73 | reg_3p3v: 3p3v { | 78 | reg_3p3v: regulator@3 { |
74 | compatible = "regulator-fixed"; | 79 | compatible = "regulator-fixed"; |
80 | reg = <3>; | ||
75 | regulator-name = "3P3V"; | 81 | regulator-name = "3P3V"; |
76 | regulator-min-microvolt = <3300000>; | 82 | regulator-min-microvolt = <3300000>; |
77 | regulator-max-microvolt = <3300000>; | 83 | regulator-max-microvolt = <3300000>; |
78 | regulator-always-on; | 84 | regulator-always-on; |
79 | }; | 85 | }; |
80 | 86 | ||
81 | reg_can_xcvr: can-xcvr { | 87 | reg_can_xcvr: regulator@4 { |
82 | compatible = "regulator-fixed"; | 88 | compatible = "regulator-fixed"; |
89 | reg = <4>; | ||
83 | regulator-name = "CAN XCVR"; | 90 | regulator-name = "CAN XCVR"; |
84 | regulator-min-microvolt = <3300000>; | 91 | regulator-min-microvolt = <3300000>; |
85 | regulator-max-microvolt = <3300000>; | 92 | regulator-max-microvolt = <3300000>; |
@@ -89,8 +96,9 @@ | |||
89 | pinctrl-0 = <&tx28_flexcan_xcvr_pins>; | 96 | pinctrl-0 = <&tx28_flexcan_xcvr_pins>; |
90 | }; | 97 | }; |
91 | 98 | ||
92 | reg_lcd: lcd-power { | 99 | reg_lcd: regulator@5 { |
93 | compatible = "regulator-fixed"; | 100 | compatible = "regulator-fixed"; |
101 | reg = <5>; | ||
94 | regulator-name = "LCD POWER"; | 102 | regulator-name = "LCD POWER"; |
95 | regulator-min-microvolt = <3300000>; | 103 | regulator-min-microvolt = <3300000>; |
96 | regulator-max-microvolt = <3300000>; | 104 | regulator-max-microvolt = <3300000>; |
@@ -98,8 +106,9 @@ | |||
98 | enable-active-high; | 106 | enable-active-high; |
99 | }; | 107 | }; |
100 | 108 | ||
101 | reg_lcd_reset: lcd-reset { | 109 | reg_lcd_reset: regulator@6 { |
102 | compatible = "regulator-fixed"; | 110 | compatible = "regulator-fixed"; |
111 | reg = <6>; | ||
103 | regulator-name = "LCD RESET"; | 112 | regulator-name = "LCD RESET"; |
104 | regulator-min-microvolt = <3300000>; | 113 | regulator-min-microvolt = <3300000>; |
105 | regulator-max-microvolt = <3300000>; | 114 | regulator-max-microvolt = <3300000>; |
diff --git a/arch/arm/boot/dts/imx53-ard.dts b/arch/arm/boot/dts/imx53-ard.dts index bf0a42cda055..e9337ad52f59 100644 --- a/arch/arm/boot/dts/imx53-ard.dts +++ b/arch/arm/boot/dts/imx53-ard.dts | |||
@@ -49,9 +49,12 @@ | |||
49 | 49 | ||
50 | regulators { | 50 | regulators { |
51 | compatible = "simple-bus"; | 51 | compatible = "simple-bus"; |
52 | #address-cells = <1>; | ||
53 | #size-cells = <0>; | ||
52 | 54 | ||
53 | reg_3p3v: 3p3v { | 55 | reg_3p3v: regulator@0 { |
54 | compatible = "regulator-fixed"; | 56 | compatible = "regulator-fixed"; |
57 | reg = <0>; | ||
55 | regulator-name = "3P3V"; | 58 | regulator-name = "3P3V"; |
56 | regulator-min-microvolt = <3300000>; | 59 | regulator-min-microvolt = <3300000>; |
57 | regulator-max-microvolt = <3300000>; | 60 | regulator-max-microvolt = <3300000>; |
diff --git a/arch/arm/boot/dts/imx53-m53evk.dts b/arch/arm/boot/dts/imx53-m53evk.dts index b3133e881118..44adf8ea6efc 100644 --- a/arch/arm/boot/dts/imx53-m53evk.dts +++ b/arch/arm/boot/dts/imx53-m53evk.dts | |||
@@ -73,9 +73,12 @@ | |||
73 | 73 | ||
74 | regulators { | 74 | regulators { |
75 | compatible = "simple-bus"; | 75 | compatible = "simple-bus"; |
76 | #address-cells = <1>; | ||
77 | #size-cells = <0>; | ||
76 | 78 | ||
77 | reg_3p2v: 3p2v { | 79 | reg_3p2v: regulator@0 { |
78 | compatible = "regulator-fixed"; | 80 | compatible = "regulator-fixed"; |
81 | reg = <0>; | ||
79 | regulator-name = "3P2V"; | 82 | regulator-name = "3P2V"; |
80 | regulator-min-microvolt = <3200000>; | 83 | regulator-min-microvolt = <3200000>; |
81 | regulator-max-microvolt = <3200000>; | 84 | regulator-max-microvolt = <3200000>; |
diff --git a/arch/arm/boot/dts/imx53-mba53.dts b/arch/arm/boot/dts/imx53-mba53.dts index c9ff1a5bb1bd..3897bd8a6bf0 100644 --- a/arch/arm/boot/dts/imx53-mba53.dts +++ b/arch/arm/boot/dts/imx53-mba53.dts | |||
@@ -37,17 +37,21 @@ | |||
37 | 37 | ||
38 | regulators { | 38 | regulators { |
39 | compatible = "simple-bus"; | 39 | compatible = "simple-bus"; |
40 | #address-cells = <1>; | ||
41 | #size-cells = <0>; | ||
40 | 42 | ||
41 | reg_backlight: fixed@0 { | 43 | reg_backlight: regulator@0 { |
42 | compatible = "regulator-fixed"; | 44 | compatible = "regulator-fixed"; |
45 | reg = <0>; | ||
43 | regulator-name = "lcd-supply"; | 46 | regulator-name = "lcd-supply"; |
44 | gpio = <&gpio2 5 0>; | 47 | gpio = <&gpio2 5 0>; |
45 | startup-delay-us = <5000>; | 48 | startup-delay-us = <5000>; |
46 | enable-active-low; | 49 | enable-active-low; |
47 | }; | 50 | }; |
48 | 51 | ||
49 | reg_3p2v: 3p2v { | 52 | reg_3p2v: regulator@1 { |
50 | compatible = "regulator-fixed"; | 53 | compatible = "regulator-fixed"; |
54 | reg = <1>; | ||
51 | regulator-name = "3P2V"; | 55 | regulator-name = "3P2V"; |
52 | regulator-min-microvolt = <3200000>; | 56 | regulator-min-microvolt = <3200000>; |
53 | regulator-max-microvolt = <3200000>; | 57 | regulator-max-microvolt = <3200000>; |
diff --git a/arch/arm/boot/dts/imx53-qsb.dts b/arch/arm/boot/dts/imx53-qsb.dts index 7755836ebf2b..5e409023bf79 100644 --- a/arch/arm/boot/dts/imx53-qsb.dts +++ b/arch/arm/boot/dts/imx53-qsb.dts | |||
@@ -86,17 +86,21 @@ | |||
86 | 86 | ||
87 | regulators { | 87 | regulators { |
88 | compatible = "simple-bus"; | 88 | compatible = "simple-bus"; |
89 | #address-cells = <1>; | ||
90 | #size-cells = <0>; | ||
89 | 91 | ||
90 | reg_3p2v: 3p2v { | 92 | reg_3p2v: regulator@0 { |
91 | compatible = "regulator-fixed"; | 93 | compatible = "regulator-fixed"; |
94 | reg = <0>; | ||
92 | regulator-name = "3P2V"; | 95 | regulator-name = "3P2V"; |
93 | regulator-min-microvolt = <3200000>; | 96 | regulator-min-microvolt = <3200000>; |
94 | regulator-max-microvolt = <3200000>; | 97 | regulator-max-microvolt = <3200000>; |
95 | regulator-always-on; | 98 | regulator-always-on; |
96 | }; | 99 | }; |
97 | 100 | ||
98 | reg_usb_vbus: usb_vbus { | 101 | reg_usb_vbus: regulator@1 { |
99 | compatible = "regulator-fixed"; | 102 | compatible = "regulator-fixed"; |
103 | reg = <1>; | ||
100 | regulator-name = "usb_vbus"; | 104 | regulator-name = "usb_vbus"; |
101 | regulator-min-microvolt = <5000000>; | 105 | regulator-min-microvolt = <5000000>; |
102 | regulator-max-microvolt = <5000000>; | 106 | regulator-max-microvolt = <5000000>; |
diff --git a/arch/arm/boot/dts/imx53-tqma53.dtsi b/arch/arm/boot/dts/imx53-tqma53.dtsi index 718dd158fa76..4f1f0e2868bf 100644 --- a/arch/arm/boot/dts/imx53-tqma53.dtsi +++ b/arch/arm/boot/dts/imx53-tqma53.dtsi | |||
@@ -22,9 +22,12 @@ | |||
22 | 22 | ||
23 | regulators { | 23 | regulators { |
24 | compatible = "simple-bus"; | 24 | compatible = "simple-bus"; |
25 | #address-cells = <1>; | ||
26 | #size-cells = <0>; | ||
25 | 27 | ||
26 | reg_3p3v: 3p3v { | 28 | reg_3p3v: regulator@0 { |
27 | compatible = "regulator-fixed"; | 29 | compatible = "regulator-fixed"; |
30 | reg = <0>; | ||
28 | regulator-name = "3P3V"; | 31 | regulator-name = "3P3V"; |
29 | regulator-min-microvolt = <3300000>; | 32 | regulator-min-microvolt = <3300000>; |
30 | regulator-max-microvolt = <3300000>; | 33 | regulator-max-microvolt = <3300000>; |
diff --git a/arch/arm/boot/dts/imx53-tx53.dtsi b/arch/arm/boot/dts/imx53-tx53.dtsi index f494766700a3..db4255c8e7e8 100644 --- a/arch/arm/boot/dts/imx53-tx53.dtsi +++ b/arch/arm/boot/dts/imx53-tx53.dtsi | |||
@@ -21,9 +21,12 @@ | |||
21 | 21 | ||
22 | regulators { | 22 | regulators { |
23 | compatible = "simple-bus"; | 23 | compatible = "simple-bus"; |
24 | #address-cells = <1>; | ||
25 | #size-cells = <0>; | ||
24 | 26 | ||
25 | reg_3p3v: 3p3v { | 27 | reg_3p3v: regulator@0 { |
26 | compatible = "regulator-fixed"; | 28 | compatible = "regulator-fixed"; |
29 | reg = <0>; | ||
27 | regulator-name = "3P3V"; | 30 | regulator-name = "3P3V"; |
28 | regulator-min-microvolt = <3300000>; | 31 | regulator-min-microvolt = <3300000>; |
29 | regulator-max-microvolt = <3300000>; | 32 | regulator-max-microvolt = <3300000>; |