ARM: dts: qcom: apq8064: Add smd node and all edges

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>
(cherry picked from commit 2afc5287c50e013c46e07413c066920dc7f55a91)

diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index d45d75f5f3470d94e2d3b3e89edaa57d5343373a..a0c1994e8432f1ba2349adc608b2968d576c7590 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -710,6 +710,52 @@
                };
        };
 
+       smd {
+               compatible = "qcom,smd";
+
+               modem@0 {
+                       interrupts = <0 37 IRQ_TYPE_EDGE_RISING>;
+
+                       qcom,ipc = <&l2cc 8 3>;
+                       qcom,smd-edge = <0>;
+
+                       status = "disabled";
+               };
+
+               q6@1 {
+                       interrupts = <0 90 IRQ_TYPE_EDGE_RISING>;
+
+                       qcom,ipc = <&l2cc 8 15>;
+                       qcom,smd-edge = <1>;
+
+                       status = "disabled";
+
+                       apr {
+                               compatible = "qcom,apr";
+                               qcom,smd-channels = "apr_audio_svc";
+                               rproc = <&pil_q6v4>;
+                       };
+               };
+
+               dsps@3 {
+                       interrupts = <0 138 IRQ_TYPE_EDGE_RISING>;
+
+                       qcom,ipc = <&sps_sic_non_secure 0x4080 0>;
+                       qcom,smd-edge = <3>;
+
+                       status = "disabled";
+               };
+
+               riva@6 {
+                       interrupts = <0 198 IRQ_TYPE_EDGE_RISING>;
+
+                       qcom,ipc = <&l2cc 8 25>;
+                       qcom,smd-edge = <6>;
+
+                       status = "disabled";
+               };
+       };
+
        smsm {
                compatible = "qcom,smsm";
 
@@ -1575,21 +1621,6 @@
                        qcom,pas-id             = <1>; /* PAS_Q6 */
                };
 
-               smd {
-                       compatible = "qcom,smd";
-                       adsp_a11 {
-                               interrupts = <0 90 IRQ_TYPE_EDGE_RISING>;
-                               qcom,ipc = <&l2cc 8 15>;
-                               qcom,smd-edge = <1>;
-                               qcom,remote-pid = <0x2>;
-                               q6_requests {
-                                       compatible      = "qcom,apr";
-                                       qcom,smd-channels = "apr_audio_svc";
-                                       rproc = <&pil_q6v4>;
-                               };
-                       };
-               };
-
                dai_fe: dai_fe {
                        compatible      = "qcom,msm-dai-fe";
                        #sound-dai-cells = <0>;