arm64: dts: qcom: qcs404: Move lpass and q6 into soc

Although we don't describe lpass and wcss with all the details needed to
control them in a Trustzone-less environment, move them under soc in
order to tidy up the structure and prepare for describing them fully.

Reviewed-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <agross@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qcom/qcs404.dtsi
index 7b56114244ca0aa0584d4f0ad948e75f2a868f64..5d67da5a6a3363ea659393bb919b2b570ec81fe8 100644 (file)
--- a/arch/arm64/boot/dts/qcom/qcs404.dtsi
+++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi
@@ -100,68 +100,6 @@
                method = "smc";
        };
 
-       remoteproc_adsp: remoteproc-adsp {
-               compatible = "qcom,qcs404-adsp-pas";
-
-               interrupts-extended = <&intc GIC_SPI 293 IRQ_TYPE_EDGE_RISING>,
-                                     <&adsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
-                                     <&adsp_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
-                                     <&adsp_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
-                                     <&adsp_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;
-               interrupt-names = "wdog", "fatal", "ready",
-                                 "handover", "stop-ack";
-
-               clocks = <&xo_board>;
-               clock-names = "xo";
-
-               memory-region = <&adsp_fw_mem>;
-
-               qcom,smem-states = <&adsp_smp2p_out 0>;
-               qcom,smem-state-names = "stop";
-
-               status = "disabled";
-
-               glink-edge {
-                       interrupts = <GIC_SPI 289 IRQ_TYPE_EDGE_RISING>;
-
-                       qcom,remote-pid = <2>;
-                       mboxes = <&apcs_glb 8>;
-
-                       label = "adsp";
-               };
-       };
-
-       remoteproc_wcss: remoteproc-wcss {
-               compatible = "qcom,qcs404-wcss-pas";
-
-               interrupts-extended = <&intc GIC_SPI 153 IRQ_TYPE_EDGE_RISING>,
-                                     <&wcss_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
-                                     <&wcss_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
-                                     <&wcss_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
-                                     <&wcss_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;
-               interrupt-names = "wdog", "fatal", "ready",
-                                 "handover", "stop-ack";
-
-               clocks = <&xo_board>;
-               clock-names = "xo";
-
-               memory-region = <&wlan_fw_mem>;
-
-               qcom,smem-states = <&wcss_smp2p_out 0>;
-               qcom,smem-state-names = "stop";
-
-               status = "disabled";
-
-               glink-edge {
-                       interrupts = <GIC_SPI 156 IRQ_TYPE_EDGE_RISING>;
-
-                       qcom,remote-pid = <1>;
-                       mboxes = <&apcs_glb 16>;
-
-                       label = "wcss";
-               };
-       };
-
        reserved-memory {
                #address-cells = <2>;
                #size-cells = <2>;
@@ -466,6 +404,38 @@
                        #interrupt-cells = <4>;
                };
 
+               remoteproc_wcss: remoteproc@7400000 {
+                       compatible = "qcom,qcs404-wcss-pas";
+                       reg = <0x07400000 0x4040>;
+
+                       interrupts-extended = <&intc GIC_SPI 153 IRQ_TYPE_EDGE_RISING>,
+                                             <&wcss_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
+                                             <&wcss_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
+                                             <&wcss_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
+                                             <&wcss_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;
+                       interrupt-names = "wdog", "fatal", "ready",
+                                         "handover", "stop-ack";
+
+                       clocks = <&xo_board>;
+                       clock-names = "xo";
+
+                       memory-region = <&wlan_fw_mem>;
+
+                       qcom,smem-states = <&wcss_smp2p_out 0>;
+                       qcom,smem-state-names = "stop";
+
+                       status = "disabled";
+
+                       glink-edge {
+                               interrupts = <GIC_SPI 156 IRQ_TYPE_EDGE_RISING>;
+
+                               qcom,remote-pid = <1>;
+                               mboxes = <&apcs_glb 16>;
+
+                               label = "wcss";
+                       };
+               };
+
                sdcc1: sdcc@7804000 {
                        compatible = "qcom,sdhci-msm-v5";
                        reg = <0x07804000 0x1000>, <0x7805000 0x1000>;
@@ -851,6 +821,38 @@
                                status = "disabled";
                        };
                };
+
+               remoteproc_adsp: remoteproc@c700000 {
+                       compatible = "qcom,qcs404-adsp-pas";
+                       reg = <0x0c700000 0x4040>;
+
+                       interrupts-extended = <&intc GIC_SPI 293 IRQ_TYPE_EDGE_RISING>,
+                                             <&adsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
+                                             <&adsp_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
+                                             <&adsp_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
+                                             <&adsp_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;
+                       interrupt-names = "wdog", "fatal", "ready",
+                                         "handover", "stop-ack";
+
+                       clocks = <&xo_board>;
+                       clock-names = "xo";
+
+                       memory-region = <&adsp_fw_mem>;
+
+                       qcom,smem-states = <&adsp_smp2p_out 0>;
+                       qcom,smem-state-names = "stop";
+
+                       status = "disabled";
+
+                       glink-edge {
+                               interrupts = <GIC_SPI 289 IRQ_TYPE_EDGE_RISING>;
+
+                               qcom,remote-pid = <2>;
+                               mboxes = <&apcs_glb 8>;
+
+                               label = "adsp";
+                       };
+               };
        };
 
        timer {