arm64: dts: qcom: sm8350: Use QMP property to control load state

Use the Qualcomm Mailbox Protocol (QMP) property to control the load
state resources on SM8350 SoCs and drop deprecated power-domains exposed
by AOSS QMP node.

Signed-off-by: Sibi Sankar <sibis@codeaurora.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/1631800770-371-11-git-send-email-sibis@codeaurora.org

diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi
index e91cd8a5e5356fbaec611ffc915e341147d6d6c6..6c83cd52a279bae624f777cfdc7ad6016769785e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8350.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi
@@ -8,7 +8,6 @@
 #include <dt-bindings/clock/qcom,rpmh.h>
 #include <dt-bindings/interconnect/qcom,sm8350.h>
 #include <dt-bindings/mailbox/qcom-ipcc.h>
-#include <dt-bindings/power/qcom-aoss-qmp.h>
 #include <dt-bindings/power/qcom-rpmpd.h>
 #include <dt-bindings/soc/qcom,rpmh-rsc.h>
 #include <dt-bindings/thermal/thermal.h>
@@ -726,15 +725,16 @@
                        clocks = <&rpmhcc RPMH_CXO_CLK>;
                        clock-names = "xo";
 
-                       power-domains = <&aoss_qmp AOSS_QMP_LS_MODEM>,
-                                       <&rpmhpd 0>,
+                       power-domains = <&rpmhpd 0>,
                                        <&rpmhpd 12>;
-                       power-domain-names = "load_state", "cx", "mss";
+                       power-domain-names = "cx", "mss";
 
                        interconnects = <&mc_virt MASTER_LLCC &mc_virt SLAVE_EBI1>;
 
                        memory-region = <&pil_modem_mem>;
 
+                       qcom,qmp = <&aoss_qmp>;
+
                        qcom,smem-states = <&smp2p_modem_out 0>;
                        qcom,smem-state-names = "stop";
 
@@ -794,7 +794,6 @@
                        mboxes = <&ipcc IPCC_CLIENT_AOP IPCC_MPROC_SIGNAL_GLINK_QMP>;
 
                        #clock-cells = <0>;
-                       #power-domain-cells = <1>;
                };
 
                spmi_bus: spmi@c440000 {
@@ -1107,13 +1106,14 @@
                        clocks = <&rpmhcc RPMH_CXO_CLK>;
                        clock-names = "xo";
 
-                       power-domains = <&aoss_qmp AOSS_QMP_LS_SLPI>,
-                                       <&rpmhpd 4>,
+                       power-domains = <&rpmhpd 4>,
                                        <&rpmhpd 5>;
-                       power-domain-names = "load_state", "lcx", "lmx";
+                       power-domain-names = "lcx", "lmx";
 
                        memory-region = <&pil_slpi_mem>;
 
+                       qcom,qmp = <&aoss_qmp>;
+
                        qcom,smem-states = <&smp2p_slpi_out 0>;
                        qcom,smem-state-names = "stop";
 
@@ -1147,15 +1147,16 @@
                        clocks = <&rpmhcc RPMH_CXO_CLK>;
                        clock-names = "xo";
 
-                       power-domains = <&aoss_qmp AOSS_QMP_LS_CDSP>,
-                                       <&rpmhpd 0>,
+                       power-domains = <&rpmhpd 0>,
                                        <&rpmhpd 10>;
-                       power-domain-names = "load_state", "cx", "mxc";
+                       power-domain-names = "cx", "mxc";
 
                        interconnects = <&compute_noc MASTER_CDSP_PROC &mc_virt SLAVE_EBI1>;
 
                        memory-region = <&pil_cdsp_mem>;
 
+                       qcom,qmp = <&aoss_qmp>;
+
                        qcom,smem-states = <&smp2p_cdsp_out 0>;
                        qcom,smem-state-names = "stop";
 
@@ -1381,13 +1382,14 @@
                        clocks = <&rpmhcc RPMH_CXO_CLK>;
                        clock-names = "xo";
 
-                       power-domains = <&aoss_qmp AOSS_QMP_LS_LPASS>,
-                                       <&rpmhpd 4>,
+                       power-domains = <&rpmhpd 4>,
                                        <&rpmhpd 5>;
-                       power-domain-names = "load_state", "lcx", "lmx";
+                       power-domain-names = "lcx", "lmx";
 
                        memory-region = <&pil_adsp_mem>;
 
+                       qcom,qmp = <&aoss_qmp>;
+
                        qcom,smem-states = <&smp2p_adsp_out 0>;
                        qcom,smem-state-names = "stop";