aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Baltieri <fabio.baltieri@linaro.org>2013-04-09 05:16:56 -0400
committerLinus Walleij <linus.walleij@linaro.org>2013-05-27 08:07:11 -0400
commit99b38eef5a86648131b8c0340ce386e9bfc71ae3 (patch)
treed7fb1afd5a8876f14d556bc752042a5a8a56ffd6
parentb1ba1439e319a2c648d6a3ff247f7bc6c1649624 (diff)
ARM: ux500: Fix intcore regulator name
Ux500 regulator name for V-INTCORE is misspelled as vinitcore instead of vintcore in some .dts file, causing the AB8500 regulator driver to not bind properly. Fix this by replacing all occurrences with the right name. Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--Documentation/devicetree/bindings/mfd/ab8500.txt2
-rw-r--r--arch/arm/boot/dts/dbx5x0.dtsi6
-rw-r--r--arch/arm/boot/dts/href.dtsi2
-rw-r--r--arch/arm/boot/dts/hrefv60plus.dts2
-rw-r--r--arch/arm/boot/dts/snowball.dts2
5 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/devicetree/bindings/mfd/ab8500.txt b/Documentation/devicetree/bindings/mfd/ab8500.txt
index c3a14e0ad0ad..cd9e90c5d171 100644
--- a/Documentation/devicetree/bindings/mfd/ab8500.txt
+++ b/Documentation/devicetree/bindings/mfd/ab8500.txt
@@ -120,7 +120,7 @@ ab8500 {
120 "USB_LINK_STATUS", 120 "USB_LINK_STATUS",
121 "USB_ADP_PROBE_PLUG", 121 "USB_ADP_PROBE_PLUG",
122 "USB_ADP_PROBE_UNPLUG"; 122 "USB_ADP_PROBE_UNPLUG";
123 vddulpivio18-supply = <&ab8500_ldo_initcore_reg>; 123 vddulpivio18-supply = <&ab8500_ldo_intcore_reg>;
124 v-ape-supply = <&db8500_vape_reg>; 124 v-ape-supply = <&db8500_vape_reg>;
125 musb_1v8-supply = <&db8500_vsmps2_reg>; 125 musb_1v8-supply = <&db8500_vsmps2_reg>;
126 }; 126 };
diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi
index 930cfc79b8f3..e1228a503a54 100644
--- a/arch/arm/boot/dts/dbx5x0.dtsi
+++ b/arch/arm/boot/dts/dbx5x0.dtsi
@@ -383,7 +383,7 @@
383 "USB_LINK_STATUS", 383 "USB_LINK_STATUS",
384 "USB_ADP_PROBE_PLUG", 384 "USB_ADP_PROBE_PLUG",
385 "USB_ADP_PROBE_UNPLUG"; 385 "USB_ADP_PROBE_UNPLUG";
386 vddulpivio18-supply = <&ab8500_ldo_initcore_reg>; 386 vddulpivio18-supply = <&ab8500_ldo_intcore_reg>;
387 v-ape-supply = <&db8500_vape_reg>; 387 v-ape-supply = <&db8500_vape_reg>;
388 musb_1v8-supply = <&db8500_vsmps2_reg>; 388 musb_1v8-supply = <&db8500_vsmps2_reg>;
389 }; 389 };
@@ -441,8 +441,8 @@
441 }; 441 };
442 442
443 // supply for v-intcore12; VINTCORE12 LDO 443 // supply for v-intcore12; VINTCORE12 LDO
444 ab8500_ldo_initcore_reg: ab8500_ldo_initcore { 444 ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
445 regulator-compatible = "ab8500_ldo_initcore"; 445 regulator-compatible = "ab8500_ldo_intcore";
446 }; 446 };
447 447
448 // supply for tvout; gpadc; TVOUT LDO 448 // supply for tvout; gpadc; TVOUT LDO
diff --git a/arch/arm/boot/dts/href.dtsi b/arch/arm/boot/dts/href.dtsi
index ba02115315f7..62523f67e01a 100644
--- a/arch/arm/boot/dts/href.dtsi
+++ b/arch/arm/boot/dts/href.dtsi
@@ -236,7 +236,7 @@
236 regulator-name = "V-MMC-SD"; 236 regulator-name = "V-MMC-SD";
237 }; 237 };
238 238
239 ab8500_ldo_initcore_reg: ab8500_ldo_initcore { 239 ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
240 regulator-name = "V-INTCORE"; 240 regulator-name = "V-INTCORE";
241 }; 241 };
242 242
diff --git a/arch/arm/boot/dts/hrefv60plus.dts b/arch/arm/boot/dts/hrefv60plus.dts
index 39060a027e27..5dfc73a22232 100644
--- a/arch/arm/boot/dts/hrefv60plus.dts
+++ b/arch/arm/boot/dts/hrefv60plus.dts
@@ -172,7 +172,7 @@
172 regulator-name = "V-MMC-SD"; 172 regulator-name = "V-MMC-SD";
173 }; 173 };
174 174
175 ab8500_ldo_initcore_reg: ab8500_ldo_initcore { 175 ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
176 regulator-name = "V-INTCORE"; 176 regulator-name = "V-INTCORE";
177 }; 177 };
178 178
diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts
index 2669295e153d..e8219cc7683e 100644
--- a/arch/arm/boot/dts/snowball.dts
+++ b/arch/arm/boot/dts/snowball.dts
@@ -322,7 +322,7 @@
322 regulator-name = "V-MMC-SD"; 322 regulator-name = "V-MMC-SD";
323 }; 323 };
324 324
325 ab8500_ldo_initcore_reg: ab8500_ldo_initcore { 325 ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
326 regulator-name = "V-INTCORE"; 326 regulator-name = "V-INTCORE";
327 }; 327 };
328 328