Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca1378d1 authored Apr 24, 2018 by 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: Krzysztof Kozlowski <krzk@kernel.org>

parent 8307c38d

arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		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 @@
		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>;

arch/arm/boot/dts/exynos4412-midas.dtsi

+4 −4

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@
		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 @@
		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 @@
		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 @@
		enable-active-high;
		};

		vcc18mhl: voltage-regulator-8 {
		vcc18mhl: voltage-regulator-5 {
		compatible = "regulator-fixed";
		regulator-name = "VCC_1.8_MHL";
		regulator-min-microvolt = <1800000>;

arch/arm/boot/dts/exynos4412-n710x.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@

		/* 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>;