arm64: dts: qcom: msm8992-bullhead: Update regulator config

* Include pm(i)8994 dtsi
* Add PMI8994 RPM regulators
* Add comments concerning "missing" regulators

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

diff --git a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
index 5969b5cfdc85a8a8692b1fd97444501dfa2d8ee5..cacbfdbd69e3825e6944bcc11a2135a025c47eb7 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
+++ b/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
@@ -6,6 +6,8 @@
 /dts-v1/;
 
 #include "msm8992.dtsi"
+#include "pm8994.dtsi"
+#include "pmi8994.dtsi"
 
 / {
        model = "LG Nexus 5X";
@@ -44,7 +46,7 @@
 };
 
 &rpm_requests {
-       pm8994-regulators {
+       pm8994_regulators: pm8994-regulators {
                compatible = "qcom,rpm-pm8994-regulators";
 
                vdd_l1-supply = <&pm8994_s1>;
@@ -53,15 +55,17 @@
                vdd_l4_27_31-supply = <&pm8994_s3>;
                vdd_l5_7-supply = <&pm8994_s3>;
                vdd_l6_12_32-supply = <&pm8994_s5>;
-               vdd_l8_16_30-supply = <&vreg_vph_pwr>;
-               vdd_l9_10_18_22-supply = <&vreg_vph_pwr>;
-               vdd_l13_19_23_24-supply = <&vreg_vph_pwr>;
+               vdd_l8_16_30-supply = <&vph_pwr>;
+               vdd_l9_10_18_22-supply = <&vph_pwr>;
+               vdd_l13_19_23_24-supply = <&vph_pwr>;
                vdd_l14_15-supply = <&pm8994_s5>;
-               vdd_l17_29-supply = <&vreg_vph_pwr>;
-               vdd_l20_21-supply = <&vreg_vph_pwr>;
+               vdd_l17_29-supply = <&vph_pwr>;
+               vdd_l20_21-supply = <&vph_pwr>;
                vdd_l25-supply = <&pm8994_s5>;
                vdd_lvs1_2 = <&pm8994_s4>;
 
+               /* S1, S2, S6 and S12 are managed by RPMPD */
+
                pm8994_s1: s1 {
                        regulator-min-microvolt = <800000>;
                        regulator-max-microvolt = <800000>;
@@ -93,6 +97,8 @@
                        regulator-max-microvolt = <1000000>;
                };
 
+               /* S8, S9, S10 and S11 - SPMI-managed VDD_APC */
+
                pm8994_l1: l1 {
                        regulator-min-microvolt = <1000000>;
                        regulator-max-microvolt = <1000000>;
@@ -113,18 +119,14 @@
                        regulator-max-microvolt = <1225000>;
                };
 
-               pm8994_l5: l5 {
-                       /* TODO */
-               };
+               /* L5 is inaccessible from RPM */
 
                pm8994_l6: l6 {
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
                };
 
-               pm8994_l7: l7 {
-                       /* TODO */
-               };
+               /* L7 is inaccessible from RPM */
 
                pm8994_l8: l8 {
                        regulator-min-microvolt = <1800000>;
@@ -266,6 +268,19 @@
                        */
                };
        };
+
+       pmi8994_regulators: pmi8994-regulators {
+               compatible = "qcom,rpm-pmi8994-regulators";
+
+               vdd_s1-supply = <&vph_pwr>;
+               vdd_bst_byp-supply = <&vph_pwr>;
+
+               pmi8994_s1: s1 {};
+
+               /* S2 & S3 - VDD_GFX */
+
+               pmi8994_bby: boost-bypass {};
+       };
 };
 
 &sdhc_1 {