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 5cdc7ac1a9c069c6b5c2243a0a247bb5c6f743eb..7f10372178d653eefc5fca31b9000bc6c6a18ef3 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 92f264891d84be1af3bc3d598937af7229753d7b..3ea793b20e7f245ff0aea6b82881e5f086382c7a 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 539823b2c36ec467e2dfee9638ca3f512120ee44..8cac23b5240c6cbadb20b7c1c27755a9b3ff12ad 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 71e373b11de9d8bb990c852aa28469653100f43e..aef92f3c49da23476b0f3804bc12237138797ae7 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 c4e87d0aec42f425c4f7d9d3524784a5b3fde630..b242c272d2af14ee5b5607c8280de48cb06fa006 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 f9d8bd09e074ac3d5140b4a6bba8c68ffe5b66f7..d8d732ec1b73fd4e8c5506ef8dffa0918a059c24 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 ff60b7004d260cab36d771f0d19e3fca5dd04a25..0c2680ff22a484846a9961941ebccf7118f7b24f 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 ca7c8d2e1d3d98229466389e9a8e9476fcccbb64..de61c3c9490310fd4ed52fc6becf27bbdda28fa9 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 77819186086ac54c722abfc5ac4a857da94fb1b4..78a1977d059370a188127832cd707915d691ea39 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 4e5264f4116a07c3120d76aea6839f7b75a22532..c8e84a934678e8ec61179bce68aa99b454a067fd 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 ff4673ee9e819a7d13ba87f04aed6cd9cfb5139a..7526f8f473b55f171ce9bc87473690536a06f838 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 79be5fb1295b0858fc6d25dd79de594d483ab6f7..b751cbbf1a232b8a562bf905e79c92565d42c0a1 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 7928b819747498d5f3e8ceeeb40c00179b3cbde8..63413e39572ce7e19581ecd4dbea6a90af331cff 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 429ba57e20f711073c69132bf93f12527cdeddb5..a7a79ddd3beaf379b48d2d1fa3cb2eea60493159 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 a3ca58100aee76569e4ab17533defd7d8e998415..abea3ffa0094b7f39e147951dc0468df31cb8845 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 62bda23791bb2b36fe8ba54211bd2e5d766c24e8..3af6deed2e8644e5c7b59f674d1b2d5e1a01ddce 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 d08639082247629bac84904fa2508b344136f92d..47cd3caa6927a0ecfa4a78ee911c8d6849ec8786 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 1678ef0f8684f17321b631f0cbc995c446bca3b7..dbbe1653718bccd7d3000f77bfa5ebc62e37b4c1 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 28050bc5f08134b12d9de0aa541935c01d2fef2d..f62a74f0e8f0b61be393d1c4827a16287554d325 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 09c07800793a058302f248e2f9fc3fc08afc2aef..f9e1d599466a92a1ff5ee8c1c5fa792af10978fe 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 891e314bc782b237afb48279afe5c4ccfc0d772f..c238fba2fe7c13cd60aef114b58e16b073af08cb 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 a3559f6e34a5e70db290961edf7ab55425bfbe0a..fea2c3e416e593d5831f1b87a9c907d2a8d401e4 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>;