ARM: dts: apq8064: Add wcnss memory and remoteproc nodes

[karo-tx-linux.git] / arch / arm / boot / dts / qcom-apq8064.dtsi

diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index 5b46c1054b756ab2bd221e62e81f4cf216e46c71..78d38bd1c0b51e0bac4037d70b2adff4fd8f9c73 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -23,6 +23,11 @@
                        reg = <0x80000000 0x200000>;
                        no-map;
                };
+
+               wcnss_mem: wcnss@8f000000 {
+                       reg = <0x8f000000 0x700000>;
+                       no-map;
+               };
        };
 
        cpus {
@@ -122,7 +127,7 @@
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
 
-                       thermal-sensors = <&tsens 7>;
+                       thermal-sensors = <&gcc 7>;
 
                        trips {
                                cpu_alert0: trip@0 {
@@ -149,7 +154,7 @@
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
 
-                       thermal-sensors = <&tsens 8>;
+                       thermal-sensors = <&gcc 8>;
 
                        trips {
                                cpu_alert1: trip@0 {
@@ -176,7 +181,7 @@
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
 
-                       thermal-sensors = <&tsens 9>;
+                       thermal-sensors = <&gcc 9>;
 
                        trips {
                                cpu_alert2: trip@0 {
@@ -203,7 +208,7 @@
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
 
-                       thermal-sensors = <&tsens 10>;
+                       thermal-sensors = <&gcc 10>;
 
                        trips {
                                cpu_alert3: trip@0 {
@@ -227,88 +232,6 @@
                };
        };
 
-       thermal-zones {
-               cpu-thermal0 {
-                       polling-delay-passive = <250>;
-                       polling-delay = <1000>;
-
-                       thermal-sensors = <&gcc 7>;
-
-                       trips {
-                               cpu_alert0: trip@0 {
-                                       temperature = <75000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-                               cpu_crit0: trip@1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "critical";
-                               };
-                       };
-               };
-
-               cpu-thermal1 {
-                       polling-delay-passive = <250>;
-                       polling-delay = <1000>;
-
-                       thermal-sensors = <&gcc 8>;
-
-                       trips {
-                               cpu_alert1: trip@0 {
-                                       temperature = <75000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-                               cpu_crit1: trip@1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "critical";
-                               };
-                       };
-               };
-
-               cpu-thermal2 {
-                       polling-delay-passive = <250>;
-                       polling-delay = <1000>;
-
-                       thermal-sensors = <&gcc 9>;
-
-                       trips {
-                               cpu_alert2: trip@0 {
-                                       temperature = <75000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-                               cpu_crit2: trip@1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "critical";
-                               };
-                       };
-               };
-
-               cpu-thermal3 {
-                       polling-delay-passive = <250>;
-                       polling-delay = <1000>;
-
-                       thermal-sensors = <&gcc 10>;
-
-                       trips {
-                               cpu_alert3: trip@0 {
-                                       temperature = <75000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-                               cpu_crit3: trip@1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "critical";
-                               };
-                       };
-               };
-       };
-
        cpu-pmu {
                compatible = "qcom,krait-pmu";
                interrupts = <1 10 0x304>;
@@ -792,6 +715,101 @@
                };
        };
 
+       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";
+
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               qcom,ipc-1 = <&l2cc 8 4>;
+               qcom,ipc-2 = <&l2cc 8 14>;
+               qcom,ipc-3 = <&l2cc 8 23>;
+               qcom,ipc-4 = <&sps_sic_non_secure 0x4094 0>;
+
+               apps_smsm: apps@0 {
+                       reg = <0>;
+                       #qcom,state-cells = <1>;
+               };
+
+               modem_smsm: modem@1 {
+                       reg = <1>;
+                       interrupts = <0 38 IRQ_TYPE_EDGE_RISING>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+
+               q6_smsm: q6@2 {
+                       reg = <2>;
+                       interrupts = <0 89 IRQ_TYPE_EDGE_RISING>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+
+               wcnss_smsm: wcnss@3 {
+                       reg = <3>;
+                       interrupts = <0 204 IRQ_TYPE_EDGE_RISING>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+
+               dsps_smsm: dsps@4 {
+                       reg = <4>;
+                       interrupts = <0 137 IRQ_TYPE_EDGE_RISING>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+       };
+
        soc: soc {
                #address-cells = <1>;
                #size-cells = <1>;
@@ -907,6 +925,11 @@
                        regulator-max-microvolt = <1250000>;
                };
 
+               sps_sic_non_secure: sps-sic-non-secure@12100000 {
+                       compatible      = "syscon";
+                       reg             = <0x12100000 0x10000>;
+               };
+
                gsbi1: gsbi@12440000 {
                        status = "disabled";
                        compatible = "qcom,gsbi-v1.0.0";
@@ -1328,6 +1351,37 @@
                        };
                };
 
+               wcnss-rproc@3204000 {
+                       compatible = "qcom,riva-pil";
+                       reg = <0x03204000 0x100>;
+
+                       interrupts-extended = <&intc 0 199 IRQ_TYPE_EDGE_RISING>,
+                                             <&wcnss_smsm 6 IRQ_TYPE_EDGE_RISING>;
+                       interrupt-names = "wdog", "fatal";
+
+                       memory-region = <&wcnss_mem>;
+
+                       vddcx-supply = <&pm8921_s3>;
+                       vddmx-supply = <&pm8921_l24>;
+                       vddpx-supply = <&pm8921_s4>;
+
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&wcnss_pin_a>;
+
+                       iris {
+                               compatible = "qcom,wcn3660";
+
+                               clocks = <&rpmcc 9>;
+                               clock-names = "xo";
+
+                               vddxo-supply = <&pm8921_l4>;
+                               vddrfa-supply = <&pm8921_s2>;
+                               vddpa-supply = <&pm8921_l10>;
+                               vdddig-supply = <&pm8921_lvs2>;
+                       };
+               };
+
+
                usb1_phy: phy@12500000 {
                        compatible      = "qcom,usb-otg-ci";
                        reg             = <0x12500000 0x400>;
@@ -1603,21 +1657,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>;