Commit ca1378d1 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski

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 c769eaf7
("ARM: dts: exynos: Split Trats2 DTS in preparation for Midas boards").
Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parent 8307c38d
...@@ -15,7 +15,7 @@ aliases { ...@@ -15,7 +15,7 @@ aliases {
i2c10 = &i2c_cm36651; i2c10 = &i2c_cm36651;
}; };
lcd_vdd3_reg: voltage-regulator-2 { lcd_vdd3_reg: voltage-regulator-6 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "LCD_VDD_2.2V"; regulator-name = "LCD_VDD_2.2V";
regulator-min-microvolt = <2200000>; regulator-min-microvolt = <2200000>;
...@@ -24,7 +24,7 @@ lcd_vdd3_reg: voltage-regulator-2 { ...@@ -24,7 +24,7 @@ lcd_vdd3_reg: voltage-regulator-2 {
enable-active-high; enable-active-high;
}; };
ps_als_reg: voltage-regulator-5 { ps_als_reg: voltage-regulator-7 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "LED_A_3.0V"; regulator-name = "LED_A_3.0V";
regulator-min-microvolt = <3000000>; regulator-min-microvolt = <3000000>;
......
...@@ -55,7 +55,7 @@ cam_io_reg: voltage-regulator-1 { ...@@ -55,7 +55,7 @@ cam_io_reg: voltage-regulator-1 {
status = "disabled"; status = "disabled";
}; };
cam_af_reg: voltage-regulator-3 { cam_af_reg: voltage-regulator-2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "CAM_AF"; regulator-name = "CAM_AF";
regulator-min-microvolt = <2800000>; regulator-min-microvolt = <2800000>;
...@@ -64,7 +64,7 @@ cam_af_reg: voltage-regulator-3 { ...@@ -64,7 +64,7 @@ cam_af_reg: voltage-regulator-3 {
status = "disabled"; status = "disabled";
}; };
vsil12: voltage-regulator-6 { vsil12: voltage-regulator-3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "VSIL_1.2V"; regulator-name = "VSIL_1.2V";
regulator-min-microvolt = <1200000>; regulator-min-microvolt = <1200000>;
...@@ -74,7 +74,7 @@ vsil12: voltage-regulator-6 { ...@@ -74,7 +74,7 @@ vsil12: voltage-regulator-6 {
vin-supply = <&buck7_reg>; vin-supply = <&buck7_reg>;
}; };
vcc33mhl: voltage-regulator-7 { vcc33mhl: voltage-regulator-4 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "VCC_3.3_MHL"; regulator-name = "VCC_3.3_MHL";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
...@@ -83,7 +83,7 @@ vcc33mhl: voltage-regulator-7 { ...@@ -83,7 +83,7 @@ vcc33mhl: voltage-regulator-7 {
enable-active-high; enable-active-high;
}; };
vcc18mhl: voltage-regulator-8 { vcc18mhl: voltage-regulator-5 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "VCC_1.8_MHL"; regulator-name = "VCC_1.8_MHL";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
......
...@@ -13,7 +13,7 @@ memory@40000000 { ...@@ -13,7 +13,7 @@ memory@40000000 {
/* bootargs are passed in by bootloader */ /* bootargs are passed in by bootloader */
cam_vdda_reg: voltage-regulator-9 { cam_vdda_reg: voltage-regulator-6 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "CAM_SENSOR_CORE_1.2V"; regulator-name = "CAM_SENSOR_CORE_1.2V";
regulator-min-microvolt = <1200000>; regulator-min-microvolt = <1200000>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment