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.

Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20241015122601.16127-1-johan+linaro@kernel.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
index b54fe61002033188d0b95515a8cf19cdf9cdb11b..ca1ced82d513da67ad8212cbbba76cf4a2d6be39 100644 (file)
--- a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
@@ -94,17 +94,6 @@
                };
        };
 
-       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 @@
                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 {

diff --git a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts
index 58ab22f2c4ff832739d61015714271fea8290545..f5f2659690915f9ba50d15a27c54e3c0f504a14b 100644 (file)
--- a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts
@@ -261,17 +261,6 @@
                };
        };
 
-       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";
 
@@ -302,6 +291,17 @@
                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";
 

diff --git a/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts b/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts
index 257907df5a649d5208bc9ca6c02f65f38b848da4..10f3ef76eef21e13613e1844f69fda9b1f00b417 100644 (file)
--- a/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts
@@ -174,17 +174,6 @@
                };
        };
 
-       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";
 
@@ -214,6 +203,17 @@
                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 {

diff --git a/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi b/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi
index ac2acf949b708a19b98360dfeaae21cdba264f3f..0e58b15e297a93b77a070ae14868376da145910d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi
+++ b/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi
@@ -142,17 +142,6 @@
                };
        };
 
-       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";
 
@@ -182,6 +171,17 @@
                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 {