Skip to contentSkip to conversation

arm64: dts: qcom: x1e80100: rename vph-pwr regulator nodes

PATCH Applied Johan Hovold 4 participants 4 messages Oct 15, 2024 – Oct 16, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: dts: qcom: x1e80100: rename vph-pwr regulator nodes

Rename the x1e80100 vph-pwr regulator nodes to use "regulator" as a prefix for consistency with the other fixed regulators.

---
 .../dts/qcom/x1e80100-asus-vivobook-s15.dts   | 22 +++++++++----------
 arch/arm64/boot/dts/qcom/x1e80100-crd.dts     | 22 +++++++++----------
 .../dts/qcom/x1e80100-lenovo-yoga-slim7x.dts  | 22 +++++++++----------
 .../dts/qcom/x1e80100-microsoft-romulus.dtsi  | 22 +++++++++----------
 4 files changed, 44 insertions(+), 44 deletions(-)
arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts +11 -11
index 20616bd4aa6c..b1f190a9686f 100644
@@ -94,17 +94,6 @@ linux,cma {
 		};
 	};
 
-	vph_pwr: vph-pwr-regulator {
-		compatible = "regulator-fixed";
-
-		regulator-name = "vph_pwr";
-		regulator-min-microvolt = <3700000>;
-		regulator-max-microvolt = <3700000>;
-
-		regulator-always-on;
-		regulator-boot-on;
-	};
-
 	vreg_edp_3p3: regulator-edp-3p3 {
 		compatible = "regulator-fixed";
 
@@ -135,6 +124,17 @@ vreg_nvme: regulator-nvme {
 		pinctrl-0 = <&nvme_reg_en>;
 		pinctrl-names = "default";
 	};
+
+	vph_pwr: regulator-vph-pwr {
+		compatible = "regulator-fixed";
+
+		regulator-name = "vph_pwr";
+		regulator-min-microvolt = <3700000>;
+		regulator-max-microvolt = <3700000>;
+
+		regulator-always-on;
+		regulator-boot-on;
+	};
 };
 
 &apps_rsc {
arch/arm64/boot/dts/qcom/x1e80100-crd.dts +11 -11
index 4ab7078f76e0..4ab9e0ca4591 100644
@@ -261,17 +261,6 @@ platform {
 		};
 	};
 
-	vph_pwr: vph-pwr-regulator {
-		compatible = "regulator-fixed";
-
-		regulator-name = "vph_pwr";
-		regulator-min-microvolt = <3700000>;
-		regulator-max-microvolt = <3700000>;
-
-		regulator-always-on;
-		regulator-boot-on;
-	};
-
 	vreg_edp_3p3: regulator-edp-3p3 {
 		compatible = "regulator-fixed";
 
@@ -319,6 +308,17 @@ vreg_nvme: regulator-nvme {
 		pinctrl-0 = <&nvme_reg_en>;
 	};
 
+	vph_pwr: regulator-vph-pwr {
+		compatible = "regulator-fixed";
+
+		regulator-name = "vph_pwr";
+		regulator-min-microvolt = <3700000>;
+		regulator-max-microvolt = <3700000>;
+
+		regulator-always-on;
+		regulator-boot-on;
+	};
+
 	vreg_wwan: regulator-wwan {
 		compatible = "regulator-fixed";
 
arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts +11 -11
index 3c13331a9ef4..10ba934652c3 100644
@@ -166,17 +166,6 @@ platform {
 		};
 	};
 
-	vph_pwr: vph-pwr-regulator {
-		compatible = "regulator-fixed";
-
-		regulator-name = "vph_pwr";
-		regulator-min-microvolt = <3700000>;
-		regulator-max-microvolt = <3700000>;
-
-		regulator-always-on;
-		regulator-boot-on;
-	};
-
 	vreg_edp_3p3: regulator-edp-3p3 {
 		compatible = "regulator-fixed";
 
@@ -206,6 +195,17 @@ vreg_nvme: regulator-nvme {
 		pinctrl-0 = <&nvme_reg_en>;
 		pinctrl-names = "default";
 	};
+
+	vph_pwr: regulator-vph-pwr {
+		compatible = "regulator-fixed";
+
+		regulator-name = "vph_pwr";
+		regulator-min-microvolt = <3700000>;
+		regulator-max-microvolt = <3700000>;
+
+		regulator-always-on;
+		regulator-boot-on;
+	};
 };
 
 &apps_rsc {
arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi +11 -11
index 42e02ad6a9c3..c47a63b5c85b 100644
@@ -125,17 +125,6 @@ linux,cma {
 		};
 	};
 
-	vph_pwr: vph-pwr-regulator {
-		compatible = "regulator-fixed";
-
-		regulator-name = "vph_pwr";
-		regulator-min-microvolt = <3700000>;
-		regulator-max-microvolt = <3700000>;
-
-		regulator-always-on;
-		regulator-boot-on;
-	};
-
 	vreg_edp_3p3: regulator-edp-3p3 {
 		compatible = "regulator-fixed";
 
@@ -165,6 +154,17 @@ vreg_nvme: regulator-nvme {
 		pinctrl-0 = <&nvme_reg_en>;
 		pinctrl-names = "default";
 	};
+
+	vph_pwr: regulator-vph-pwr {
+		compatible = "regulator-fixed";
+
+		regulator-name = "vph_pwr";
+		regulator-min-microvolt = <3700000>;
+		regulator-max-microvolt = <3700000>;
+
+		regulator-always-on;
+		regulator-boot-on;
+	};
 };
 
 &apps_rsc {
Signature · 1 line
2.45.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 161 lines · Johan Hovold

Rename the x1e80100 vph-pwr regulator nodes to use "regulator" as a prefix for consistency with the other fixed regulators.

---
  .../dts/qcom/x1e80100-asus-vivobook-s15.dts   | 22 +++++++++----------
  arch/arm64/boot/dts/qcom/x1e80100-crd.dts     | 22 +++++++++----------
  .../dts/qcom/x1e80100-lenovo-yoga-slim7x.dts  | 22 +++++++++----------
  .../dts/qcom/x1e80100-microsoft-romulus.dtsi  | 22 +++++++++----------
  4 files changed, 44 insertions(+), 44 deletions(-)
arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts +11 -11
index 20616bd4aa6c..b1f190a9686f 100644
@@ -94,17 +94,6 @@ linux,cma {
  		};
  	};
 
-	vph_pwr: vph-pwr-regulator {
-		compatible = "regulator-fixed";
-
-		regulator-name = "vph_pwr";
-		regulator-min-microvolt = <3700000>;
-		regulator-max-microvolt = <3700000>;
-
-		regulator-always-on;
-		regulator-boot-on;
-	};
-
  	vreg_edp_3p3: regulator-edp-3p3 {
  		compatible = "regulator-fixed";
 
@@ -135,6 +124,17 @@ vreg_nvme: regulator-nvme {
  		pinctrl-0 = <&nvme_reg_en>;
  		pinctrl-names = "default";
  	};
+
+	vph_pwr: regulator-vph-pwr {
+		compatible = "regulator-fixed";
+
+		regulator-name = "vph_pwr";
+		regulator-min-microvolt = <3700000>;
+		regulator-max-microvolt = <3700000>;
+
+		regulator-always-on;
+		regulator-boot-on;
+	};
  };
 
  &apps_rsc {
arch/arm64/boot/dts/qcom/x1e80100-crd.dts +11 -11
index 4ab7078f76e0..4ab9e0ca4591 100644
@@ -261,17 +261,6 @@ platform {
  		};
  	};
 
-	vph_pwr: vph-pwr-regulator {
-		compatible = "regulator-fixed";
-
-		regulator-name = "vph_pwr";
-		regulator-min-microvolt = <3700000>;
-		regulator-max-microvolt = <3700000>;
-
-		regulator-always-on;
-		regulator-boot-on;
-	};
-
  	vreg_edp_3p3: regulator-edp-3p3 {
  		compatible = "regulator-fixed";
 
@@ -319,6 +308,17 @@ vreg_nvme: regulator-nvme {
  		pinctrl-0 = <&nvme_reg_en>;
  	};
 
+	vph_pwr: regulator-vph-pwr {
+		compatible = "regulator-fixed";
+
+		regulator-name = "vph_pwr";
+		regulator-min-microvolt = <3700000>;
+		regulator-max-microvolt = <3700000>;
+
+		regulator-always-on;
+		regulator-boot-on;
+	};
+
  	vreg_wwan: regulator-wwan {
  		compatible = "regulator-fixed";
 
arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts +11 -11
index 3c13331a9ef4..10ba934652c3 100644
@@ -166,17 +166,6 @@ platform {
  		};
  	};
 
-	vph_pwr: vph-pwr-regulator {
-		compatible = "regulator-fixed";
-
-		regulator-name = "vph_pwr";
-		regulator-min-microvolt = <3700000>;
-		regulator-max-microvolt = <3700000>;
-
-		regulator-always-on;
-		regulator-boot-on;
-	};
-
  	vreg_edp_3p3: regulator-edp-3p3 {
  		compatible = "regulator-fixed";
 
@@ -206,6 +195,17 @@ vreg_nvme: regulator-nvme {
  		pinctrl-0 = <&nvme_reg_en>;
  		pinctrl-names = "default";
  	};
+
+	vph_pwr: regulator-vph-pwr {
+		compatible = "regulator-fixed";
+
+		regulator-name = "vph_pwr";
+		regulator-min-microvolt = <3700000>;
+		regulator-max-microvolt = <3700000>;
+
+		regulator-always-on;
+		regulator-boot-on;
+	};
  };
 
  &apps_rsc {
arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi +4 -11
index 42e02ad6a9c3..c47a63b5c85b 100644
@@ -125,17 +125,6 @@ linux,cma {
  		};
  	};
 
-	vph_pwr: vph-pwr-regulator {
-		compatible = "regulator-fixed";
-
-		regulator-name = "vph_pwr";
-		regulator-min-microvolt = <3700000>;
-		regulator-max-microvolt = <3700000>;
-
-		regulator-always-on;
-		regulator-boot-on;
-	};
-
  	vreg_edp_3p3: regulator-edp-3p3 {
  		compatible = "regulator-fixed";
 
@@ -165,6 +154,17 @@ vreg_nvme: regulator-nvme {
  		pinctrl-0 = <&nvme_reg_en>;
  		pinctrl-names = "default";
  	};
+
+	vph_pwr: regulator-vph-pwr {
+		compatible = "regulator-fixed";
+

arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi vreg_nvme: regulator-nvme { · line 170

Quoted 10 lines
arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi +7 -0
+		regulator-name = "vph_pwr";
+		regulator-min-microvolt = <3700000>;
+		regulator-max-microvolt = <3700000>;
+
+		regulator-always-on;
+		regulator-boot-on;
+	};
  };
 
  &apps_rsc {
Reviewed-by on v1 1/1
#2 lore raw
In reply to Johan Hovold
Quoted 11 lines · Johan Hovold

Rename the x1e80100 vph-pwr regulator nodes to use "regulator" as a prefix for consistency with the other fixed regulators.

---
 .../dts/qcom/x1e80100-asus-vivobook-s15.dts   | 22 +++++++++----------
 arch/arm64/boot/dts/qcom/x1e80100-crd.dts     | 22 +++++++++----------
 .../dts/qcom/x1e80100-lenovo-yoga-slim7x.dts  | 22 +++++++++----------
 .../dts/qcom/x1e80100-microsoft-romulus.dtsi  | 22 +++++++++----------
 4 files changed, 44 insertions(+), 44 deletions(-)
Signature · 2 lines
With best wishes
Dmitry
maintainer Applied
#3 lore raw
In reply to Johan Hovold
Quoted 4 lines · Johan Hovold

Rename the x1e80100 vph-pwr regulator nodes to use "regulator" as a prefix for consistency with the other fixed regulators.

Applied, thanks!

[1/1] arm64: dts: qcom: x1e80100: rename vph-pwr regulator nodes

      commit: 87c1870b5aea744d73f0e4442a285056c64d1239

Best regards,

Signature · 1 line
Bjorn Andersson <[email protected]>