arm64: dts: qcom: msm8916: Use power domains for MSS/WCNSS remoteprocs

So far we have been making proxy votes for the remote processors
through the regulator interface. Now that we have rpmpd it's better
to vote for performance states through the power domain interface.

This also allows us to move these supplies back to msm8916.dtsi
because the device tree binding for RPMPD is independent of the
underlying regulator/PMIC.

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Link: https://lore.kernel.org/r/20200916104135.25085-10-stephan@gerhold.net
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
index cd626e7db5999ae511f6fdbec741944765623fb1..513e433aa5f355f48899d721d1ab2f569938b46b 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
@@ -17,13 +17,10 @@
 };
 
 &mpss {
-       cx-supply = <&pm8916_s1>;
-       mx-supply = <&pm8916_l3>;
        pll-supply = <&pm8916_l7>;
 };
 
 &pronto {
-       vddmx-supply = <&pm8916_l3>;
        vddpx-supply = <&pm8916_l7>;
 
        iris {

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 117804f94c35dc109f1330c22621f0b85e47a718..74aa50f3db1041db122bba10d2bf0eb323bd230e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -8,6 +8,7 @@
 #include <dt-bindings/clock/qcom,rpmcc.h>
 #include <dt-bindings/interconnect/qcom,msm8916.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/power/qcom-rpmpd.h>
 #include <dt-bindings/reset/qcom,gcc-msm8916.h>
 #include <dt-bindings/thermal/thermal.h>
 
@@ -1292,6 +1293,10 @@
                        interrupt-names = "wdog", "fatal", "ready",
                                          "handover", "stop-ack";
 
+                       power-domains = <&rpmpd MSM8916_VDDCX>,
+                                       <&rpmpd MSM8916_VDDMX>;
+                       power-domain-names = "cx", "mx";
+
                        clocks = <&gcc GCC_MSS_CFG_AHB_CLK>,
                                 <&gcc GCC_MSS_Q6_BIMC_AXI_CLK>,
                                 <&gcc GCC_BOOT_ROM_AHB_CLK>,
@@ -1689,6 +1694,10 @@
                                              <&wcnss_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;
                        interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack";
 
+                       power-domains = <&rpmpd MSM8916_VDDCX>,
+                                       <&rpmpd MSM8916_VDDMX>;
+                       power-domain-names = "cx", "mx";
+
                        qcom,state = <&wcnss_smp2p_out 0>;
                        qcom,state-names = "stop";