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

Use the Qualcomm Mailbox Protocol (QMP) property to control the load
state resources on SM8150 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-9-git-send-email-sibis@codeaurora.org

diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi
index ef0232c..8a03569 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
@@ -6,7 +6,6 @@
 
 #include <dt-bindings/dma/qcom-gpi.h>
 #include <dt-bindings/interrupt-controller/arm-gic.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/clock/qcom,rpmh.h>
@@ -1729,13 +1728,14 @@
                        clocks = <&rpmhcc RPMH_CXO_CLK>;
                        clock-names = "xo";
 
-                       power-domains = <&aoss_qmp AOSS_QMP_LS_SLPI>,
-                                       <&rpmhpd 3>,
+                       power-domains = <&rpmhpd 3>,
                                        <&rpmhpd 2>;
-                       power-domain-names = "load_state", "lcx", "lmx";
+                       power-domain-names = "lcx", "lmx";
 
                        memory-region = <&slpi_mem>;
 
+                       qcom,qmp = <&aoss_qmp>;
+
                        qcom,smem-states = <&slpi_smp2p_out 0>;
                        qcom,smem-state-names = "stop";
 
@@ -2319,13 +2319,14 @@
                        clocks = <&rpmhcc RPMH_CXO_CLK>;
                        clock-names = "xo";
 
-                       power-domains = <&aoss_qmp AOSS_QMP_LS_MODEM>,
-                                       <&rpmhpd 7>,
+                       power-domains = <&rpmhpd 7>,
                                        <&rpmhpd 0>;
-                       power-domain-names = "load_state", "cx", "mss";
+                       power-domain-names = "cx", "mss";
 
                        memory-region = <&mpss_mem>;
 
+                       qcom,qmp = <&aoss_qmp>;
+
                        qcom,smem-states = <&modem_smp2p_out 0>;
                        qcom,smem-state-names = "stop";
 
@@ -2945,12 +2946,12 @@
                        clocks = <&rpmhcc RPMH_CXO_CLK>;
                        clock-names = "xo";
 
-                       power-domains = <&aoss_qmp AOSS_QMP_LS_CDSP>,
-                                       <&rpmhpd 7>;
-                       power-domain-names = "load_state", "cx";
+                       power-domains = <&rpmhpd 7>;
 
                        memory-region = <&cdsp_mem>;
 
+                       qcom,qmp = <&aoss_qmp>;
+
                        qcom,smem-states = <&cdsp_smp2p_out 0>;
                        qcom,smem-state-names = "stop";
 
@@ -3174,7 +3175,6 @@
                        mboxes = <&apss_shared 0>;
 
                        #clock-cells = <0>;
-                       #power-domain-cells = <1>;
                };
 
                tsens0: thermal-sensor@c263000 {
@@ -3321,12 +3321,12 @@
                        clocks = <&rpmhcc RPMH_CXO_CLK>;
                        clock-names = "xo";
 
-                       power-domains = <&aoss_qmp AOSS_QMP_LS_LPASS>,
-                                       <&rpmhpd 7>;
-                       power-domain-names = "load_state", "cx";
+                       power-domains = <&rpmhpd 7>;
 
                        memory-region = <&adsp_mem>;
 
+                       qcom,qmp = <&aoss_qmp>;
+
                        qcom,smem-states = <&adsp_smp2p_out 0>;
                        qcom,smem-state-names = "stop";