linux-kernel - [PATCH 4/5] ARM: dts: exynos: Bring order in fixed-regulators naming in Midas boards

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 24 Apr 2018 19:46:01 +0200
From:   Krzysztof Kozlowski <krzk@...nel.org>
To:     Rob Herring <robh+dt@...nel.org>,
        Mark Rutland <mark.rutland@....com>,
        Kukjin Kim <kgene@...nel.org>,
        Krzysztof Kozlowski <krzk@...nel.org>,
        Marek Szyprowski <m.szyprowski@...sung.com>,
        devicetree@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
        linux-samsung-soc@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH 4/5] 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@...nel.org>
---
 arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 4 ++--
 arch/arm/boot/dts/exynos4412-midas.dtsi     | 8 ++++----
 arch/arm/boot/dts/exynos4412-n710x.dts      | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
index 31cd5f6fd83c..606946a264da 100644
--- a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
+++ b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
@@ -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>;
diff --git a/arch/arm/boot/dts/exynos4412-midas.dtsi b/arch/arm/boot/dts/exynos4412-midas.dtsi
index 4b182e26cfc8..dc11ca1673e8 100644
--- a/arch/arm/boot/dts/exynos4412-midas.dtsi
+++ b/arch/arm/boot/dts/exynos4412-midas.dtsi
@@ -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>;
diff --git a/arch/arm/boot/dts/exynos4412-n710x.dts b/arch/arm/boot/dts/exynos4412-n710x.dts
index 36818b1697a4..fe2bfd76cc4e 100644
--- a/arch/arm/boot/dts/exynos4412-n710x.dts
+++ b/arch/arm/boot/dts/exynos4412-n710x.dts
@@ -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>;
-- 
2.14.1