arm64: dts: qcom: msm8994-kitakami: Update regulator configuration

Remove regulator-always-on property where not necessary and mark regulators
that are not supposed to be voted active on boot with regulator-boot-on.
While at it, reorder the load properties to make it look more decent.

Reorder PMICs to fix a probe defer caused by messy dependencies and Linux's
inability to handle them (at least for now).

Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220319174645.340379-12-konrad.dybcio@somainline.org

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 5e93ab0..e5a45af 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
@@ -187,26 +187,38 @@
 };
 
 &rpm_requests {
+       /* PMI8994 should probe first, because pmi8994_bby supplies some of PM8994's regulators */
+       pmi8994_regulators: pmi8994-regulators {
+               compatible = "qcom,rpm-pmi8994-regulators";
+
+               vdd_s1-supply = <&vph_pwr>;
+               vdd_bst_byp-supply = <&vph_pwr>;
+
+               pmi8994_s1: s1 {
+                       regulator-min-microvolt = <1025000>;
+                       regulator-max-microvolt = <1025000>;
+               };
+
+               /* S2 & S3 - VDD_GFX */
+
+               pmi8994_bby: boost-bypass {
+                       regulator-min-microvolt = <3150000>;
+                       regulator-max-microvolt = <3600000>;
+               };
+       };
+
        pm8994_regulators: pm8994-regulators {
                compatible = "qcom,rpm-pm8994-regulators";
 
-               vdd_s1-supply = <&vph_pwr>;
-               vdd_s2-supply = <&vph_pwr>;
                vdd_s3-supply = <&vph_pwr>;
                vdd_s4-supply = <&vph_pwr>;
                vdd_s5-supply = <&vph_pwr>;
                vdd_s6-supply = <&vph_pwr>;
                vdd_s7-supply = <&vph_pwr>;
-               vdd_s8-supply = <&vph_pwr>;
-               vdd_s9-supply = <&vph_pwr>;
-               vdd_s10-supply = <&vph_pwr>;
-               vdd_s11-supply = <&vph_pwr>;
-               vdd_s12-supply = <&vph_pwr>;
                vdd_l1-supply = <&pmi8994_s1>;
                vdd_l2_l26_l28-supply = <&pm8994_s3>;
                vdd_l3_l11-supply = <&pm8994_s3>;
                vdd_l4_l27_l31-supply = <&pm8994_s3>;
-               vdd_l5_l7-supply = <&pm8994_s5>;
                vdd_l6_l12_l32-supply = <&pm8994_s5>;
                vdd_l8_l16_l30-supply = <&vph_pwr>;
                vdd_l9_l10_l18_l22-supply = <&pmi8994_bby>;
@@ -227,9 +239,9 @@
                pm8994_s4: s4 {
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
+                       regulator-system-load = <325000>;
                        regulator-allow-set-load;
                        regulator-always-on;
-                       regulator-system-load = <325000>;
                };
 
                pm8994_s5: s5 {
@@ -255,13 +267,14 @@
                pm8994_l2: l2 {
                        regulator-min-microvolt = <1250000>;
                        regulator-max-microvolt = <1250000>;
-                       regulator-allow-set-load;
                        regulator-system-load = <10000>;
+                       regulator-allow-set-load;
                };
 
                pm8994_l3: l3 {
                        regulator-min-microvolt = <1100000>;
                        regulator-max-microvolt = <1100000>;
+                       regulator-boot-on;
                };
 
                pm8994_l4: l4 {
@@ -301,8 +314,8 @@
                pm8994_l12: l12 {
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
-                       regulator-allow-set-load;
                        regulator-system-load = <10000>;
+                       regulator-allow-set-load;
                };
 
                pm8994_l13: l13 {
@@ -313,8 +326,9 @@
                pm8994_l14: l14 {
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
-                       regulator-allow-set-load;
                        regulator-system-load = <10000>;
+                       regulator-allow-set-load;
+                       regulator-boot-on;
                };
 
                pm8994_l15: l15 {
@@ -330,44 +344,47 @@
                pm8994_l17: l17 {
                        regulator-min-microvolt = <2200000>;
                        regulator-max-microvolt = <2200000>;
+                       regulator-boot-on;
                };
 
                pm8994_l18: l18 {
                        regulator-min-microvolt = <2850000>;
                        regulator-max-microvolt = <2850000>;
                        regulator-always-on;
+                       regulator-boot-on;
                };
 
                pm8994_l19: l19 {
                        regulator-min-microvolt = <2850000>;
                        regulator-max-microvolt = <2850000>;
+                       regulator-boot-on;
                };
 
                pm8994_l20: l20 {
                        regulator-min-microvolt = <2950000>;
                        regulator-max-microvolt = <2950000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       regulator-allow-set-load;
                        regulator-system-load = <570000>;
+                       regulator-allow-set-load;
                };
 
                pm8994_l21: l21 {
                        regulator-min-microvolt = <2950000>;
                        regulator-max-microvolt = <2950000>;
-                       regulator-always-on;
-                       regulator-allow-set-load;
                        regulator-system-load = <800000>;
+                       regulator-allow-set-load;
                };
 
                pm8994_l22: l22 {
                        regulator-min-microvolt = <3000000>;
                        regulator-max-microvolt = <3000000>;
+                       regulator-boot-on;
                };
 
                pm8994_l23: l23 {
                        regulator-min-microvolt = <2800000>;
                        regulator-max-microvolt = <2800000>;
+                       regulator-always-on;
+                       regulator-boot-on;
                };
 
                pm8994_l24: l24 {
@@ -378,6 +395,7 @@
                pm8994_l25: l25 {
                        regulator-min-microvolt = <1000000>;
                        regulator-max-microvolt = <1000000>;
+                       regulator-boot-on;
                };
 
                pm8994_l26: l26 {
@@ -388,30 +406,33 @@
                pm8994_l27: l27 {
                        regulator-min-microvolt = <1200000>;
                        regulator-max-microvolt = <1200000>;
+                       regulator-boot-on;
                };
 
                pm8994_l28: l28 {
                        regulator-min-microvolt = <1000000>;
                        regulator-max-microvolt = <1000000>;
-                       regulator-allow-set-load;
                        regulator-system-load = <10000>;
+                       regulator-allow-set-load;
                };
 
                pm8994_l29: l29 {
                        regulator-min-microvolt = <2700000>;
                        regulator-max-microvolt = <2700000>;
+                       regulator-boot-on;
                };
 
                pm8994_l30: l30 {
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
+                       regulator-boot-on;
                };
 
                pm8994_l31: l31 {
                        regulator-min-microvolt = <1200000>;
                        regulator-max-microvolt = <1200000>;
-                       regulator-allow-set-load;
                        regulator-system-load = <10000>;
+                       regulator-allow-set-load;
                };
 
                pm8994_l32: l32 {
@@ -419,26 +440,11 @@
                        regulator-max-microvolt = <1800000>;
                };
 
-               pm8994_lvs1: lvs1 {};
-               pm8994_lvs2: lvs2 {};
-       };
-
-       pmi8994_regulators: pmi8994-regulators {
-               compatible = "qcom,rpm-pmi8994-regulators";
-
-               vdd_s1-supply = <&vph_pwr>;
-               vdd_bst_byp-supply = <&vph_pwr>;
-
-               pmi8994_s1: s1 {
-                       regulator-min-microvolt = <1025000>;
-                       regulator-max-microvolt = <1025000>;
+               pm8994_lvs1: lvs1 {
+                       regulator-boot-on;
                };
-
-               /* S2 & S3 - VDD_GFX */
-
-               pmi8994_bby: boost-bypass {
-                       regulator-min-microvolt = <3150000>;
-                       regulator-max-microvolt = <3600000>;
+               pm8994_lvs2: lvs2 {
+                       regulator-boot-on;
                };
        };
 };