ARM: dts: exynos: Bring order in fixed-regulators naming in Midas boards

exynos4412-midas.dtsi is base for galaxy-s3.dtsi and n710x.dts.  All of
them contain fixed regulators named "voltage-regulator-X".  Their
indexes got mixed up while splitting common code in commit c769eaf7a85d
("ARM: dts: exynos: Split Trats2 DTS in preparation for Midas boards").

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

diff --git a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
index 31cd5f6fd83c9b22d1edb68169ec99edfa879090..606946a264da94da2c58a189ad99c7ddcb66c359 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
+++ b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
@@ -15,7 +15,7 @@ aliases {
                i2c10 = &i2c_cm36651;
        };
 
-       lcd_vdd3_reg: voltage-regulator-2 {
+       lcd_vdd3_reg: voltage-regulator-6 {
                compatible = "regulator-fixed";
                regulator-name = "LCD_VDD_2.2V";
                regulator-min-microvolt = <2200000>;
@@ -24,7 +24,7 @@ lcd_vdd3_reg: voltage-regulator-2 {
                enable-active-high;
        };
 
-       ps_als_reg: voltage-regulator-5 {
+       ps_als_reg: voltage-regulator-7 {
                compatible = "regulator-fixed";
                regulator-name = "LED_A_3.0V";
                regulator-min-microvolt = <3000000>;

diff --git a/arch/arm/boot/dts/exynos4412-midas.dtsi b/arch/arm/boot/dts/exynos4412-midas.dtsi
index 4b182e26cfc81c4c57aed7b5b07df31f060a79f6..dc11ca1673e8b21f9c49e7982813a6e2fd3e0d1a 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-midas.dtsi
+++ b/arch/arm/boot/dts/exynos4412-midas.dtsi
@@ -55,7 +55,7 @@ cam_io_reg: voltage-regulator-1 {
                status = "disabled";
        };
 
-       cam_af_reg: voltage-regulator-3 {
+       cam_af_reg: voltage-regulator-2 {
                compatible = "regulator-fixed";
                regulator-name = "CAM_AF";
                regulator-min-microvolt = <2800000>;
@@ -64,7 +64,7 @@ cam_af_reg: voltage-regulator-3 {
                status = "disabled";
        };
 
-       vsil12: voltage-regulator-6 {
+       vsil12: voltage-regulator-3 {
                compatible = "regulator-fixed";
                regulator-name = "VSIL_1.2V";
                regulator-min-microvolt = <1200000>;
@@ -74,7 +74,7 @@ vsil12: voltage-regulator-6 {
                vin-supply = <&buck7_reg>;
        };
 
-       vcc33mhl: voltage-regulator-7 {
+       vcc33mhl: voltage-regulator-4 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_3.3_MHL";
                regulator-min-microvolt = <3300000>;
@@ -83,7 +83,7 @@ vcc33mhl: voltage-regulator-7 {
                enable-active-high;
        };
 
-       vcc18mhl: voltage-regulator-8 {
+       vcc18mhl: voltage-regulator-5 {
                compatible = "regulator-fixed";
                regulator-name = "VCC_1.8_MHL";
                regulator-min-microvolt = <1800000>;

diff --git a/arch/arm/boot/dts/exynos4412-n710x.dts b/arch/arm/boot/dts/exynos4412-n710x.dts
index 36818b1697a42edb75e5314e8a74254ad8d2f23c..fe2bfd76cc4e9dff1d9e5c3853f1f70b75e59f72 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-n710x.dts
+++ b/arch/arm/boot/dts/exynos4412-n710x.dts
@@ -13,7 +13,7 @@ memory@40000000 {
 
        /* bootargs are passed in by bootloader */
 
-       cam_vdda_reg: voltage-regulator-9 {
+       cam_vdda_reg: voltage-regulator-6 {
                compatible = "regulator-fixed";
                regulator-name = "CAM_SENSOR_CORE_1.2V";
                regulator-min-microvolt = <1200000>;