arm64: dts: qcom: sc7280: Update Q6V5 MSS node

Update MSS node to support MSA based modem boot on SC7280 SoCs.

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/1631886935-14691-11-git-send-email-sibis@codeaurora.org

diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
index e0972fa..272d5ca 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
@@ -306,6 +306,13 @@
        status = "okay";
 };
 
+&remoteproc_mpss {
+       status = "okay";
+       compatible = "qcom,sc7280-mss-pil";
+       iommus = <&apps_smmu 0x124 0x0>, <&apps_smmu 0x488 0x7>;
+       memory-region = <&mba_mem &mpss_mem>;
+};
+
 &sdhc_1 {
        status = "okay";
 

diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
index 002bc34..2495657 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
@@ -1761,7 +1761,8 @@
 
                remoteproc_mpss: remoteproc@4080000 {
                        compatible = "qcom,sc7280-mpss-pas";
-                       reg = <0 0x04080000 0 0x10000>;
+                       reg = <0 0x04080000 0 0x10000>, <0 0x04180000 0 0x48>;
+                       reg-names = "qdsp6", "rmb";
 
                        interrupts-extended = <&intc GIC_SPI 264 IRQ_TYPE_EDGE_RISING>,
                                              <&modem_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
@@ -1772,8 +1773,12 @@
                        interrupt-names = "wdog", "fatal", "ready", "handover",
                                          "stop-ack", "shutdown-ack";
 
-                       clocks = <&rpmhcc RPMH_CXO_CLK>;
-                       clock-names = "xo";
+                       clocks = <&gcc GCC_MSS_CFG_AHB_CLK>,
+                                <&gcc GCC_MSS_OFFLINE_AXI_CLK>,
+                                <&gcc GCC_MSS_SNOC_AXI_CLK>,
+                                <&rpmhcc RPMH_PKA_CLK>,
+                                <&rpmhcc RPMH_CXO_CLK>;
+                       clock-names = "iface", "offline", "snoc_axi", "pka", "xo";
 
                        power-domains = <&rpmhpd SC7280_CX>,
                                        <&rpmhpd SC7280_MSS>;
@@ -1786,6 +1791,14 @@
                        qcom,smem-states = <&modem_smp2p_out 0>;
                        qcom,smem-state-names = "stop";
 
+                       resets = <&aoss_reset AOSS_CC_MSS_RESTART>,
+                                <&pdc_reset PDC_MODEM_SYNC_RESET>;
+                       reset-names = "mss_restart", "pdc_reset";
+
+                       qcom,halt-regs = <&tcsr_mutex 0x23000 0x25000 0x28000 0x33000>;
+                       qcom,ext-regs = <&tcsr 0x10000 0x10004 &tcsr_mutex 0x26004 0x26008>;
+                       qcom,qaccept-regs = <&tcsr_mutex 0x23030 0x23040 0x23020>;
+
                        status = "disabled";
 
                        glink-edge {