arm64: dts: qcom: align RPM regulators node name with bindings

Node names should be generic and new DT schema expects RPM regulators
node to be just "regulators".

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220926092104.111449-3-krzysztof.kozlowski@linaro.org

diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
index 5cdc7ac..7f10372 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
+++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
@@ -751,7 +751,7 @@
 };
 
 &rpm_requests {
-       pm8994-regulators {
+       regulators-0 {
                compatible = "qcom,rpm-pm8994-regulators";
 
                vdd_s1-supply = <&vph_pwr>;
@@ -963,7 +963,7 @@
                };
        };
 
-       pmi8994-regulators {
+       regulators-1 {
                compatible = "qcom,rpm-pmi8994-regulators";
 
                vdd_s1-supply = <&vph_pwr>;

diff --git a/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts b/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
index 92f2648..3ea793b 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
+++ b/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
@@ -162,7 +162,7 @@
 };
 
 &rpm_requests {
-       pm8994-regulators {
+       regulators-0 {
                compatible = "qcom,rpm-pm8994-regulators";
 
                vdd_s1-supply = <&vph_pwr>;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
index 539823b..8cac23b 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
@@ -47,7 +47,7 @@
 };
 
 &rpm_requests {
-       smd_rpm_regulators: pm8916-regulators {
+       smd_rpm_regulators: regulators {
                compatible = "qcom,rpm-pm8916-regulators";
 
                /* pm8916_s1 is managed by rpmpd (MSM8916_VDDCX) */

diff --git a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
index 71e373b..aef92f3 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
@@ -58,7 +58,7 @@
 };
 
 &rpm_requests {
-       pm8994_regulators: pm8994-regulators {
+       pm8994_regulators: regulators-0 {
                compatible = "qcom,rpm-pm8994-regulators";
 
                vdd_l1-supply = <&pm8994_s1>;
@@ -281,7 +281,7 @@
                };
        };
 
-       pmi8994_regulators: pmi8994-regulators {
+       pmi8994_regulators: regulators-1 {
                compatible = "qcom,rpm-pmi8994-regulators";
 
                vdd_s1-supply = <&vph_pwr>;

diff --git a/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts b/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts
index c4e87d0..b242c27 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts
+++ b/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts
@@ -153,7 +153,7 @@
 };
 
 &rpm_requests {
-       pm8994-regulators {
+       regulators-0 {
                compatible = "qcom,rpm-pm8994-regulators";
 
                vdd_l1-supply = <&pm8994_s7>;
@@ -363,7 +363,7 @@
                pm8994_lvs2: lvs2 {};
        };
 
-       pmi8994_regulators: pmi8994-regulators {
+       pmi8994_regulators: regulators-1 {
                compatible = "qcom,rpm-pmi8994-regulators";
                vdd_s1-supply = <&vph_pwr>;
                vdd_bst_byp-supply = <&vph_pwr>;

diff --git a/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi b/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi
index f9d8bd0..d8d732e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi
@@ -551,7 +551,7 @@
 
 &rpm_requests {
        /* These values were taken from the original firmware ACPI tables */
-       pm8994_regulators: pm8994-regulators {
+       pm8994_regulators: regulators-0 {
                compatible = "qcom,rpm-pm8994-regulators";
 
                vdd_s1-supply = <&vph_pwr>;
@@ -835,7 +835,7 @@
                vreg_lvs2a_1p8: lvs2 { };
        };
 
-       pmi8994_regulators: pmi8994-regulators {
+       pmi8994_regulators: regulators-1 {
                compatible = "qcom,rpm-pmi8994-regulators";
 
                vdd_s1-supply = <&vph_pwr>;

diff --git a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
index ff60b70..0c2680f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
@@ -186,7 +186,7 @@
 
 &rpm_requests {
        /* PMI8994 should probe first, because pmi8994_bby supplies some of PM8994's regulators */
-       pmi8994_regulators: pmi8994-regulators {
+       pmi8994_regulators: regulators-0 {
                compatible = "qcom,rpm-pmi8994-regulators";
 
                vdd_s1-supply = <&vph_pwr>;
@@ -205,7 +205,7 @@
                };
        };
 
-       pm8994_regulators: pm8994-regulators {
+       pm8994_regulators: regulators-1 {
                compatible = "qcom,rpm-pm8994-regulators";
 
                vdd_s3-supply = <&vph_pwr>;

diff --git a/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi b/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi
index ca7c8d2..de61c3c 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi
@@ -629,7 +629,7 @@
 };
 
 &rpm_requests {
-       pm8994-regulators {
+       regulators-0 {
                compatible = "qcom,rpm-pm8994-regulators";
 
                vdd_s1-supply = <&vph_pwr>;

diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
index 7781918..78a1977 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
@@ -413,7 +413,7 @@
 };
 
 &rpm_requests {
-       pm8994-regulators {
+       regulators-0 {
                compatible = "qcom,rpm-pm8994-regulators";
 
                vdd_s1-supply = <&vph_pwr>;
@@ -598,7 +598,7 @@
                };
        };
 
-       pmi8994-regulators {
+       regulators-1 {
                compatible = "qcom,rpm-pmi8994-regulators";
 
                vdd_s1-supply = <&vph_pwr>;

diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
index 4e5264f..c8e84a9 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
+++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
@@ -219,7 +219,7 @@
 };
 
 &rpm_requests {
-       pm8994-regulators {
+       regulators-0 {
                vreg_l17a_2p8: l17 {
                        regulator-name = "vreg_l17a_2p8";
                        regulator-min-microvolt = <2500000>;

diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-natrium.dts b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-natrium.dts
index ff4673e..7526f8f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-natrium.dts
+++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-natrium.dts
@@ -164,7 +164,7 @@
 };
 
 &rpm_requests {
-       pm8994-regulators {
+       regulators-0 {
                vreg_l3a_0p875: l3 {
                        regulator-name = "vreg_l3a_0p875";
                        regulator-min-microvolt = <850000>;

diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts
index 79be5fb..b751cbb 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts
+++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts
@@ -216,7 +216,7 @@
 };
 
 &rpm_requests {
-       pm8994-regulators {
+       regulators-0 {
                vreg_l3a_0p875: l3 {
                        regulator-name = "vreg_l3a_0p875";
                        regulator-min-microvolt = <850000>;

diff --git a/arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi b/arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi
index 7928b81..63413e3 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi
@@ -137,7 +137,7 @@
 };
 
 &rpm_requests {
-       pm8998-regulators {
+       regulators-0 {
                compatible = "qcom,rpm-pm8998-regulators";
 
                vdd_s1-supply = <&vph_pwr>;

diff --git a/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts b/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts
index 429ba57..a7a79dd 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts
+++ b/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts
@@ -390,7 +390,7 @@
 };
 
 &rpm_requests {
-       pm8998-regulators {
+       regulators-0 {
                compatible = "qcom,rpm-pm8998-regulators";
 
                vdd_s1-supply = <&vph_pwr>;
@@ -588,7 +588,7 @@
 
        };
 
-       pmi8998-regulators {
+       regulators-1 {
                compatible = "qcom,rpm-pmi8998-regulators";
 
                vdd_bob-supply = <&vph_pwr>;

diff --git a/arch/arm64/boot/dts/qcom/msm8998-mtp.dts b/arch/arm64/boot/dts/qcom/msm8998-mtp.dts
index a3ca581..abea3ff 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/msm8998-mtp.dts
@@ -168,7 +168,7 @@
 };
 
 &rpm_requests {
-       pm8998-regulators {
+       regulators-0 {
                compatible = "qcom,rpm-pm8998-regulators";
 
                vdd_s1-supply = <&vph_pwr>;
@@ -366,7 +366,7 @@
 
        };
 
-       pmi8998-regulators {
+       regulators-1 {
                compatible = "qcom,rpm-pmi8998-regulators";
 
                vdd_bob-supply = <&vph_pwr>;

diff --git a/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi
index 62bda23..3af6dee 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi
@@ -288,7 +288,7 @@
 };
 
 &rpm_requests {
-       pm8998-regulators {
+       regulators-0 {
                compatible = "qcom,rpm-pm8998-regulators";
 
                vdd_s1-supply = <&vph_pwr>;
@@ -477,7 +477,7 @@
                vreg_lvs2a_1p8: lvs2 { };
        };
 
-       pmi8998-regulators {
+       regulators-1 {
                compatible = "qcom,rpm-pmi8998-regulators";
 
                vdd_bob-supply = <&vph_pwr>;

diff --git a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
index d086390..47cd3ca 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
@@ -375,7 +375,7 @@
 };
 
 &rpm_requests {
-       pm8998-regulators {
+       regulators-0 {
                compatible = "qcom,rpm-pm8998-regulators";
 
                vdd_s1-supply = <&vph_pwr>;
@@ -538,7 +538,7 @@
                vreg_lvs2a_1p8: lvs2 { };
        };
 
-       pmi8998-regulators {
+       regulators-1 {
                compatible = "qcom,rpm-pmi8998-regulators";
 
                vdd_bob-supply = <&vph_pwr>;

diff --git a/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi b/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi
index 1678ef0..dbbe165 100644 (file)
--- a/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi
+++ b/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi
@@ -125,7 +125,7 @@
 };
 
 &rpm_requests {
-       pms405-regulators {
+       regulators {
                compatible = "qcom,rpm-pms405-regulators";
 
                vdd_s1-supply = <&vph_pwr>;

diff --git a/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts b/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts
index 28050bc..f62a74f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts
+++ b/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts
@@ -231,7 +231,7 @@
 };
 
 &rpm_requests {
-       pm660-regulators {
+       regulators-0 {
                compatible = "qcom,rpm-pm660-regulators";
 
                vdd_s1-supply = <&vph_pwr>;
@@ -313,7 +313,7 @@
                };
        };
 
-       pm660l-regulators {
+       regulators-1 {
                compatible = "qcom,rpm-pm660l-regulators";
 
                vdd_s1-supply = <&vph_pwr>;

diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
index 09c0780..f9e1d59 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
@@ -260,7 +260,7 @@
 };
 
 &rpm_requests {
-       pm660l-regulators {
+       regulators-0 {
                compatible = "qcom,rpm-pm660l-regulators";
 
                vdd_s1-supply = <&vph_pwr>;
@@ -394,7 +394,7 @@
                };
        };
 
-       pm660-regulators {
+       regulators-1 {
                compatible = "qcom,rpm-pm660-regulators";
 
                vdd_s1-supply = <&vph_pwr>;

diff --git a/arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts b/arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts
index 891e314..c238fba 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts
+++ b/arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts
@@ -69,7 +69,7 @@
 };
 
 &rpm_requests {
-       pm8953-regulators {
+       regulators {
                compatible = "qcom,rpm-pm8953-regulators";
 
                vdd_l1-supply = <&pm8953_s3>;

diff --git a/arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts b/arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts
index a3559f6..fea2c3e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts
+++ b/arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts
@@ -111,7 +111,7 @@
 };
 
 &rpm_requests {
-       pm660l-regulators {
+       regulators-0 {
                compatible = "qcom,rpm-pm660l-regulators";
 
                vdd_s1-supply = <&vph_pwr>;
@@ -206,7 +206,7 @@
                };
        };
 
-       pm660-regulators {
+       regulators-1 {
                compatible = "qcom,rpm-pm660-regulators";
 
                vdd_s1-supply = <&vph_pwr>;