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>

diff --git a/Documentation/devicetree/bindings/mfd/ab8500.txt b/Documentation/devicetree/bindings/mfd/ab8500.txt
index c3a14e0..cd9e90c 100644 (file)
--- a/Documentation/devicetree/bindings/mfd/ab8500.txt
+++ b/Documentation/devicetree/bindings/mfd/ab8500.txt
@@ -120,7 +120,7 @@ ab8500 {
                                   "USB_LINK_STATUS",
                                   "USB_ADP_PROBE_PLUG",
                                   "USB_ADP_PROBE_UNPLUG";
-                vddulpivio18-supply = <&ab8500_ldo_initcore_reg>;
+                vddulpivio18-supply = <&ab8500_ldo_intcore_reg>;
                 v-ape-supply = <&db8500_vape_reg>;
                 musb_1v8-supply = <&db8500_vsmps2_reg>;
         };

diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi
index 930cfc7..e1228a5 100644 (file)
--- a/arch/arm/boot/dts/dbx5x0.dtsi
+++ b/arch/arm/boot/dts/dbx5x0.dtsi
@@ -383,7 +383,7 @@
                                                          "USB_LINK_STATUS",
                                                          "USB_ADP_PROBE_PLUG",
                                                          "USB_ADP_PROBE_UNPLUG";
-                                       vddulpivio18-supply = <&ab8500_ldo_initcore_reg>;
+                                       vddulpivio18-supply = <&ab8500_ldo_intcore_reg>;
                                        v-ape-supply = <&db8500_vape_reg>;
                                        musb_1v8-supply = <&db8500_vsmps2_reg>;
                                };
@@ -441,8 +441,8 @@
                                        };
 
                                        // supply for v-intcore12; VINTCORE12 LDO
-                                       ab8500_ldo_initcore_reg: ab8500_ldo_initcore {
-                                               regulator-compatible = "ab8500_ldo_initcore";
+                                       ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
+                                               regulator-compatible = "ab8500_ldo_intcore";
                                        };
 
                                        // supply for tvout; gpadc; TVOUT LDO

diff --git a/arch/arm/boot/dts/href.dtsi b/arch/arm/boot/dts/href.dtsi
index ba02115..62523f6 100644 (file)
--- a/arch/arm/boot/dts/href.dtsi
+++ b/arch/arm/boot/dts/href.dtsi
@@ -236,7 +236,7 @@
                                                regulator-name = "V-MMC-SD";
                                        };
 
-                                       ab8500_ldo_initcore_reg: ab8500_ldo_initcore {
+                                       ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
                                                regulator-name = "V-INTCORE";
                                        };
 

diff --git a/arch/arm/boot/dts/hrefv60plus.dts b/arch/arm/boot/dts/hrefv60plus.dts
index 39060a0..5dfc73a 100644 (file)
--- a/arch/arm/boot/dts/hrefv60plus.dts
+++ b/arch/arm/boot/dts/hrefv60plus.dts
@@ -172,7 +172,7 @@
                                                regulator-name = "V-MMC-SD";
                                        };
 
-                                       ab8500_ldo_initcore_reg: ab8500_ldo_initcore {
+                                       ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
                                                regulator-name = "V-INTCORE";
                                        };
 

diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts
index 2669295..e8219cc 100644 (file)
--- a/arch/arm/boot/dts/snowball.dts
+++ b/arch/arm/boot/dts/snowball.dts
@@ -322,7 +322,7 @@
                                                regulator-name = "V-MMC-SD";
                                        };
 
-                                       ab8500_ldo_initcore_reg: ab8500_ldo_initcore {
+                                       ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
                                                regulator-name = "V-INTCORE";
                                        };