Merge branch 'for-5.11' into for-linus
[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / qcom / msm8916.dtsi
index 67cae5f..aaa2189 100644 (file)
@@ -4,11 +4,11 @@
  */
 
 #include <dt-bindings/arm/coresight-cti-dt.h>
+#include <dt-bindings/clock/qcom,gcc-msm8916.h>
+#include <dt-bindings/clock/qcom,rpmcc.h>
 #include <dt-bindings/interconnect/qcom,msm8916.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
-#include <dt-bindings/clock/qcom,gcc-msm8916.h>
 #include <dt-bindings/reset/qcom,gcc-msm8916.h>
-#include <dt-bindings/clock/qcom,rpmcc.h>
 #include <dt-bindings/thermal/thermal.h>
 
 / {
                };
        };
 
+       clocks {
+               xo_board: xo-board {
+                       compatible = "fixed-clock";
+                       #clock-cells = <0>;
+                       clock-frequency = <19200000>;
+               };
+
+               sleep_clk: sleep-clk {
+                       compatible = "fixed-clock";
+                       #clock-cells = <0>;
+                       clock-frequency = <32768>;
+               };
+       };
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
                };
 
                L2_0: l2-cache {
-                     compatible = "cache";
-                     cache-level = <2>;
+                       compatible = "cache";
+                       cache-level = <2>;
                };
 
                idle-states {
                };
        };
 
+       cpu_opp_table: cpu-opp-table {
+               compatible = "operating-points-v2";
+               opp-shared;
+
+               opp-200000000 {
+                       opp-hz = /bits/ 64 <200000000>;
+               };
+               opp-400000000 {
+                       opp-hz = /bits/ 64 <400000000>;
+               };
+               opp-800000000 {
+                       opp-hz = /bits/ 64 <800000000>;
+               };
+               opp-998400000 {
+                       opp-hz = /bits/ 64 <998400000>;
+               };
+       };
+
+       firmware {
+               scm: scm {
+                       compatible = "qcom,scm-msm8916", "qcom,scm";
+                       clocks = <&gcc GCC_CRYPTO_CLK>,
+                                <&gcc GCC_CRYPTO_AXI_CLK>,
+                                <&gcc GCC_CRYPTO_AHB_CLK>;
+                       clock-names = "core", "bus", "iface";
+                       #reset-cells = <1>;
+
+                       qcom,dload-mode = <&tcsr 0x6100>;
+               };
+       };
+
+       pmu {
+               compatible = "arm,cortex-a53-pmu";
+               interrupts = <GIC_PPI 7 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
+       };
+
        psci {
                compatible = "arm,psci-1.0";
                method = "smc";
                };
        };
 
-       pmu {
-               compatible = "arm,cortex-a53-pmu";
-               interrupts = <GIC_PPI 7 (GIC_CPU_MASK_SIMPLE(4)| IRQ_TYPE_LEVEL_HIGH)>;
-       };
-
-       thermal-zones {
-               cpu0_1-thermal {
-                       polling-delay-passive = <250>;
-                       polling-delay = <1000>;
+       smd {
+               compatible = "qcom,smd";
 
-                       thermal-sensors = <&tsens 5>;
+               rpm {
+                       interrupts = <GIC_SPI 168 IRQ_TYPE_EDGE_RISING>;
+                       qcom,ipc = <&apcs 8 0>;
+                       qcom,smd-edge = <15>;
 
-                       trips {
-                               cpu0_1_alert0: trip-point@0 {
-                                       temperature = <75000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-                               cpu0_1_crit: cpu_crit {
-                                       temperature = <110000>;
-                                       hysteresis = <2000>;
-                                       type = "critical";
-                               };
-                       };
+                       rpm_requests: rpm-requests {
+                               compatible = "qcom,rpm-msm8916";
+                               qcom,smd-channels = "rpm_requests";
 
-                       cooling-maps {
-                               map0 {
-                                       trip = <&cpu0_1_alert0>;
-                                       cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                                        <&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                                        <&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                                        <&CPU3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+                               rpmcc: clock-controller {
+                                       compatible = "qcom,rpmcc-msm8916";
+                                       #clock-cells = <1>;
                                };
                        };
                };
+       };
 
-               cpu2_3-thermal {
-                       polling-delay-passive = <250>;
-                       polling-delay = <1000>;
+       smem {
+               compatible = "qcom,smem";
 
-                       thermal-sensors = <&tsens 4>;
+               memory-region = <&smem_mem>;
+               qcom,rpm-msg-ram = <&rpm_msg_ram>;
 
-                       trips {
-                               cpu2_3_alert0: trip-point0 {
-                                       temperature = <75000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-                               cpu2_3_crit: cpu_crit {
-                                       temperature = <110000>;
-                                       hysteresis = <2000>;
-                                       type = "critical";
-                               };
-                       };
+               hwlocks = <&tcsr_mutex 3>;
+       };
 
-                       cooling-maps {
-                               map0 {
-                                       trip = <&cpu2_3_alert0>;
-                                       cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                                        <&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                                        <&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-                                                        <&CPU3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-                               };
-                       };
-               };
+       smp2p-hexagon {
+               compatible = "qcom,smp2p";
+               qcom,smem = <435>, <428>;
 
-               gpu-thermal {
-                       polling-delay-passive = <250>;
-                       polling-delay = <1000>;
+               interrupts = <GIC_SPI 27 IRQ_TYPE_EDGE_RISING>;
 
-                       thermal-sensors = <&tsens 2>;
+               qcom,ipc = <&apcs 8 14>;
 
-                       trips {
-                               gpu_alert0: trip-point0 {
-                                       temperature = <75000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-                               gpu_crit: gpu_crit {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "critical";
-                               };
-                       };
-               };
+               qcom,local-pid = <0>;
+               qcom,remote-pid = <1>;
 
-               camera-thermal {
-                       polling-delay-passive = <250>;
-                       polling-delay = <1000>;
+               hexagon_smp2p_out: master-kernel {
+                       qcom,entry-name = "master-kernel";
 
-                       thermal-sensors = <&tsens 1>;
+                       #qcom,smem-state-cells = <1>;
+               };
 
-                       trips {
-                               cam_alert0: trip-point0 {
-                                       temperature = <75000>;
-                                       hysteresis = <2000>;
-                                       type = "hot";
-                               };
-                       };
+               hexagon_smp2p_in: slave-kernel {
+                       qcom,entry-name = "slave-kernel";
+
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
                };
+       };
 
-               modem-thermal {
-                       polling-delay-passive = <250>;
-                       polling-delay = <1000>;
+       smp2p-wcnss {
+               compatible = "qcom,smp2p";
+               qcom,smem = <451>, <431>;
 
-                       thermal-sensors = <&tsens 0>;
+               interrupts = <GIC_SPI 143 IRQ_TYPE_EDGE_RISING>;
 
-                       trips {
-                               modem_alert0: trip-point0 {
-                                       temperature = <85000>;
-                                       hysteresis = <2000>;
-                                       type = "hot";
-                               };
-                       };
-               };
+               qcom,ipc = <&apcs 8 18>;
 
-       };
+               qcom,local-pid = <0>;
+               qcom,remote-pid = <4>;
 
-       cpu_opp_table: cpu-opp-table {
-               compatible = "operating-points-v2";
-               opp-shared;
+               wcnss_smp2p_out: master-kernel {
+                       qcom,entry-name = "master-kernel";
 
-               opp-200000000 {
-                       opp-hz = /bits/ 64 <200000000>;
-               };
-               opp-400000000 {
-                       opp-hz = /bits/ 64 <400000000>;
-               };
-               opp-800000000 {
-                       opp-hz = /bits/ 64 <800000000>;
+                       #qcom,smem-state-cells = <1>;
                };
-               opp-998400000 {
-                       opp-hz = /bits/ 64 <998400000>;
+
+               wcnss_smp2p_in: slave-kernel {
+                       qcom,entry-name = "slave-kernel";
+
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
                };
        };
 
-       timer {
-               compatible = "arm,armv8-timer";
-               interrupts = <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-                            <GIC_PPI 3 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-                            <GIC_PPI 4 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-                            <GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
-       };
+       smsm {
+               compatible = "qcom,smsm";
 
-       clocks {
-               xo_board: xo-board {
-                       compatible = "fixed-clock";
-                       #clock-cells = <0>;
-                       clock-frequency = <19200000>;
-               };
+               #address-cells = <1>;
+               #size-cells = <0>;
 
-               sleep_clk: sleep-clk {
-                       compatible = "fixed-clock";
-                       #clock-cells = <0>;
-                       clock-frequency = <32768>;
-               };
-       };
+               qcom,ipc-1 = <&apcs 8 13>;
+               qcom,ipc-3 = <&apcs 8 19>;
 
-       smem {
-               compatible = "qcom,smem";
+               apps_smsm: apps@0 {
+                       reg = <0>;
 
-               memory-region = <&smem_mem>;
-               qcom,rpm-msg-ram = <&rpm_msg_ram>;
+                       #qcom,smem-state-cells = <1>;
+               };
 
-               hwlocks = <&tcsr_mutex 3>;
-       };
+               hexagon_smsm: hexagon@1 {
+                       reg = <1>;
+                       interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
 
-       firmware {
-               scm: scm {
-                       compatible = "qcom,scm";
-                       clocks = <&gcc GCC_CRYPTO_CLK>, <&gcc GCC_CRYPTO_AXI_CLK>, <&gcc GCC_CRYPTO_AHB_CLK>;
-                       clock-names = "core", "bus", "iface";
-                       #reset-cells = <1>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
 
-                       qcom,dload-mode = <&tcsr 0x6100>;
+               wcnss_smsm: wcnss@6 {
+                       reg = <6>;
+                       interrupts = <GIC_SPI 144 IRQ_TYPE_EDGE_RISING>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
                };
        };
 
                ranges = <0 0 0 0xffffffff>;
                compatible = "simple-bus";
 
-               bimc: interconnect@400000 {
-                       compatible = "qcom,msm8916-bimc";
-                       reg = <0x00400000 0x62000>;
-                       #interconnect-cells = <1>;
-                       clock-names = "bus", "bus_a";
-                       clocks = <&rpmcc RPM_SMD_BIMC_CLK>,
-                                <&rpmcc RPM_SMD_BIMC_A_CLK>;
+               rng@22000 {
+                       compatible = "qcom,prng";
+                       reg = <0x00022000 0x200>;
+                       clocks = <&gcc GCC_PRNG_AHB_CLK>;
+                       clock-names = "core";
                };
 
                restart@4ab000 {
                        compatible = "qcom,pshold";
-                       reg = <0x4ab000 0x4>;
+                       reg = <0x004ab000 0x4>;
+               };
+
+               qfprom: qfprom@5c000 {
+                       compatible = "qcom,qfprom";
+                       reg = <0x0005c000 0x1000>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       tsens_caldata: caldata@d0 {
+                               reg = <0xd0 0x8>;
+                       };
+                       tsens_calsel: calsel@ec {
+                               reg = <0xec 0x4>;
+                       };
+               };
+
+               rpm_msg_ram: memory@60000 {
+                       compatible = "qcom,rpm-msg-ram";
+                       reg = <0x00060000 0x8000>;
+               };
+
+               bimc: interconnect@400000 {
+                       compatible = "qcom,msm8916-bimc";
+                       reg = <0x00400000 0x62000>;
+                       #interconnect-cells = <1>;
+                       clock-names = "bus", "bus_a";
+                       clocks = <&rpmcc RPM_SMD_BIMC_CLK>,
+                                <&rpmcc RPM_SMD_BIMC_A_CLK>;
+               };
+
+               tsens: thermal-sensor@4a9000 {
+                       compatible = "qcom,msm8916-tsens", "qcom,tsens-v0_1";
+                       reg = <0x004a9000 0x1000>, /* TM */
+                             <0x004a8000 0x1000>; /* SROT */
+                       nvmem-cells = <&tsens_caldata>, <&tsens_calsel>;
+                       nvmem-cell-names = "calib", "calib_sel";
+                       #qcom,sensors = <5>;
+                       interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "uplow";
+                       #thermal-sensor-cells = <1>;
                };
 
                pcnoc: interconnect@500000 {
                                 <&rpmcc RPM_SMD_SNOC_A_CLK>;
                };
 
-               msmgpio: pinctrl@1000000 {
-                       compatible = "qcom,msm8916-pinctrl";
-                       reg = <0x1000000 0x300000>;
-                       interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
-                       gpio-controller;
-                       gpio-ranges = <&msmgpio 0 0 122>;
-                       #gpio-cells = <2>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-               };
+               /* System CTIs */
+               /* CTI 0 - TMC connections */
+               cti0: cti@810000 {
+                       compatible = "arm,coresight-cti", "arm,primecell";
+                       reg = <0x00810000 0x1000>;
 
-               gcc: clock-controller@1800000 {
-                       compatible = "qcom,gcc-msm8916";
-                       #clock-cells = <1>;
-                       #reset-cells = <1>;
-                       #power-domain-cells = <1>;
-                       reg = <0x1800000 0x80000>;
-               };
+                       clocks = <&rpmcc RPM_QDSS_CLK>;
+                       clock-names = "apb_pclk";
 
-               tcsr_mutex_regs: syscon@1905000 {
-                       compatible = "syscon";
-                       reg = <0x1905000 0x20000>;
+                       status = "disabled";
                };
 
-               tcsr: syscon@1937000 {
-                       compatible = "qcom,tcsr-msm8916", "syscon";
-                       reg = <0x1937000 0x30000>;
-               };
+               /* CTI 1 - TPIU connections */
+               cti1: cti@811000 {
+                       compatible = "arm,coresight-cti", "arm,primecell";
+                       reg = <0x00811000 0x1000>;
 
-               tcsr_mutex: hwlock {
-                       compatible = "qcom,tcsr-mutex";
-                       syscon = <&tcsr_mutex_regs 0 0x1000>;
-                       #hwlock-cells = <1>;
-               };
+                       clocks = <&rpmcc RPM_QDSS_CLK>;
+                       clock-names = "apb_pclk";
 
-               rpm_msg_ram: memory@60000 {
-                       compatible = "qcom,rpm-msg-ram";
-                       reg = <0x60000 0x8000>;
+                       status = "disabled";
                };
 
-               blsp1_uart1: serial@78af000 {
-                       compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
-                       reg = <0x78af000 0x200>;
-                       interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_UART1_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>;
-                       clock-names = "core", "iface";
-                       dmas = <&blsp_dma 1>, <&blsp_dma 0>;
-                       dma-names = "rx", "tx";
+               /* CTIs 2-11 - no information - not instantiated */
+
+               tpiu: tpiu@820000 {
+                       compatible = "arm,coresight-tpiu", "arm,primecell";
+                       reg = <0x00820000 0x1000>;
+
+                       clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
+                       clock-names = "apb_pclk", "atclk";
+
                        status = "disabled";
-               };
 
-               a53pll: clock@b016000 {
-                       compatible = "qcom,msm8916-a53pll";
-                       reg = <0xb016000 0x40>;
-                       #clock-cells = <0>;
+                       in-ports {
+                               port {
+                                       tpiu_in: endpoint {
+                                               remote-endpoint = <&replicator_out1>;
+                                       };
+                               };
+                       };
                };
 
-               apcs: mailbox@b011000 {
-                       compatible = "qcom,msm8916-apcs-kpss-global", "syscon";
-                       reg = <0xb011000 0x1000>;
-                       #mbox-cells = <1>;
-                       clocks = <&a53pll>, <&gcc GPLL0_VOTE>;
-                       clock-names = "pll", "aux";
-                       #clock-cells = <0>;
-               };
+               funnel0: funnel@821000 {
+                       compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
+                       reg = <0x00821000 0x1000>;
+
+                       clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
+                       clock-names = "apb_pclk", "atclk";
 
-               blsp1_uart2: serial@78b0000 {
-                       compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
-                       reg = <0x78b0000 0x200>;
-                       interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_UART2_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>;
-                       clock-names = "core", "iface";
-                       dmas = <&blsp_dma 3>, <&blsp_dma 2>;
-                       dma-names = "rx", "tx";
                        status = "disabled";
+
+                       in-ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               /*
+                                * Not described input ports:
+                                * 0 - connected to Resource and Power Manger CPU ETM
+                                * 1 - not-connected
+                                * 2 - connected to Modem CPU ETM
+                                * 3 - not-connected
+                                * 5 - not-connected
+                                * 6 - connected trought funnel to Wireless CPU ETM
+                                * 7 - connected to STM component
+                                */
+
+                               port@4 {
+                                       reg = <4>;
+                                       funnel0_in4: endpoint {
+                                               remote-endpoint = <&funnel1_out>;
+                                       };
+                               };
+                       };
+
+                       out-ports {
+                               port {
+                                       funnel0_out: endpoint {
+                                               remote-endpoint = <&etf_in>;
+                                       };
+                               };
+                       };
                };
 
-               blsp_dma: dma@7884000 {
-                       compatible = "qcom,bam-v1.7.0";
-                       reg = <0x07884000 0x23000>;
-                       interrupts = <GIC_SPI 238 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>;
-                       clock-names = "bam_clk";
-                       #dma-cells = <1>;
-                       qcom,ee = <0>;
+               replicator: replicator@824000 {
+                       compatible = "arm,coresight-dynamic-replicator", "arm,primecell";
+                       reg = <0x00824000 0x1000>;
+
+                       clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
+                       clock-names = "apb_pclk", "atclk";
+
                        status = "disabled";
+
+                       out-ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+                                       replicator_out0: endpoint {
+                                               remote-endpoint = <&etr_in>;
+                                       };
+                               };
+                               port@1 {
+                                       reg = <1>;
+                                       replicator_out1: endpoint {
+                                               remote-endpoint = <&tpiu_in>;
+                                       };
+                               };
+                       };
+
+                       in-ports {
+                               port {
+                                       replicator_in: endpoint {
+                                               remote-endpoint = <&etf_out>;
+                                       };
+                               };
+                       };
                };
 
-               blsp_spi1: spi@78b5000 {
-                       compatible = "qcom,spi-qup-v2.2.1";
-                       reg = <0x078b5000 0x500>;
-                       interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_QUP1_SPI_APPS_CLK>,
-                                <&gcc GCC_BLSP1_AHB_CLK>;
-                       clock-names = "core", "iface";
-                       dmas = <&blsp_dma 5>, <&blsp_dma 4>;
-                       dma-names = "rx", "tx";
-                       pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&spi1_default>;
-                       pinctrl-1 = <&spi1_sleep>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
+               etf: etf@825000 {
+                       compatible = "arm,coresight-tmc", "arm,primecell";
+                       reg = <0x00825000 0x1000>;
+
+                       clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
+                       clock-names = "apb_pclk", "atclk";
+
                        status = "disabled";
+
+                       in-ports {
+                               port {
+                                       etf_in: endpoint {
+                                               remote-endpoint = <&funnel0_out>;
+                                       };
+                               };
+                       };
+
+                       out-ports {
+                               port {
+                                       etf_out: endpoint {
+                                               remote-endpoint = <&replicator_in>;
+                                       };
+                               };
+                       };
                };
 
-               blsp_spi2: spi@78b6000 {
-                       compatible = "qcom,spi-qup-v2.2.1";
-                       reg = <0x078b6000 0x500>;
-                       interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_QUP2_SPI_APPS_CLK>,
-                                <&gcc GCC_BLSP1_AHB_CLK>;
-                       clock-names = "core", "iface";
-                       dmas = <&blsp_dma 7>, <&blsp_dma 6>;
-                       dma-names = "rx", "tx";
-                       pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&spi2_default>;
-                       pinctrl-1 = <&spi2_sleep>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
+               etr: etr@826000 {
+                       compatible = "arm,coresight-tmc", "arm,primecell";
+                       reg = <0x00826000 0x1000>;
+
+                       clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
+                       clock-names = "apb_pclk", "atclk";
+
                        status = "disabled";
+
+                       in-ports {
+                               port {
+                                       etr_in: endpoint {
+                                               remote-endpoint = <&replicator_out0>;
+                                       };
+                               };
+                       };
                };
 
-               blsp_spi3: spi@78b7000 {
-                       compatible = "qcom,spi-qup-v2.2.1";
-                       reg = <0x078b7000 0x500>;
-                       interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_QUP3_SPI_APPS_CLK>,
-                                <&gcc GCC_BLSP1_AHB_CLK>;
-                       clock-names = "core", "iface";
-                       dmas = <&blsp_dma 9>, <&blsp_dma 8>;
-                       dma-names = "rx", "tx";
-                       pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&spi3_default>;
-                       pinctrl-1 = <&spi3_sleep>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       status = "disabled";
-               };
+               funnel1: funnel@841000 {        /* APSS funnel only 4 inputs are used */
+                       compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
+                       reg = <0x00841000 0x1000>;
 
-               blsp_spi4: spi@78b8000 {
-                       compatible = "qcom,spi-qup-v2.2.1";
-                       reg = <0x078b8000 0x500>;
-                       interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_QUP4_SPI_APPS_CLK>,
-                                <&gcc GCC_BLSP1_AHB_CLK>;
-                       clock-names = "core", "iface";
-                       dmas = <&blsp_dma 11>, <&blsp_dma 10>;
-                       dma-names = "rx", "tx";
-                       pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&spi4_default>;
-                       pinctrl-1 = <&spi4_sleep>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       status = "disabled";
-               };
+                       clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
+                       clock-names = "apb_pclk", "atclk";
 
-               blsp_spi5: spi@78b9000 {
-                       compatible = "qcom,spi-qup-v2.2.1";
-                       reg = <0x078b9000 0x500>;
-                       interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_QUP5_SPI_APPS_CLK>,
-                                <&gcc GCC_BLSP1_AHB_CLK>;
-                       clock-names = "core", "iface";
-                       dmas = <&blsp_dma 13>, <&blsp_dma 12>;
-                       dma-names = "rx", "tx";
-                       pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&spi5_default>;
-                       pinctrl-1 = <&spi5_sleep>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
                        status = "disabled";
-               };
 
-               blsp_spi6: spi@78ba000 {
-                       compatible = "qcom,spi-qup-v2.2.1";
-                       reg = <0x078ba000 0x500>;
-                       interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_QUP6_SPI_APPS_CLK>,
-                                <&gcc GCC_BLSP1_AHB_CLK>;
-                       clock-names = "core", "iface";
-                       dmas = <&blsp_dma 15>, <&blsp_dma 14>;
-                       dma-names = "rx", "tx";
-                       pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&spi6_default>;
-                       pinctrl-1 = <&spi6_sleep>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       status = "disabled";
+                       in-ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+                                       funnel1_in0: endpoint {
+                                               remote-endpoint = <&etm0_out>;
+                                       };
+                               };
+                               port@1 {
+                                       reg = <1>;
+                                       funnel1_in1: endpoint {
+                                               remote-endpoint = <&etm1_out>;
+                                       };
+                               };
+                               port@2 {
+                                       reg = <2>;
+                                       funnel1_in2: endpoint {
+                                               remote-endpoint = <&etm2_out>;
+                                       };
+                               };
+                               port@3 {
+                                       reg = <3>;
+                                       funnel1_in3: endpoint {
+                                               remote-endpoint = <&etm3_out>;
+                                       };
+                               };
+                       };
+
+                       out-ports {
+                               port {
+                                       funnel1_out: endpoint {
+                                               remote-endpoint = <&funnel0_in4>;
+                                       };
+                               };
+                       };
                };
 
-               blsp_i2c1: i2c@78b5000 {
-                       compatible = "qcom,i2c-qup-v2.2.1";
-                       reg = <0x078b5000 0x500>;
-                       interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP1_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
-                       pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&i2c1_default>;
-                       pinctrl-1 = <&i2c1_sleep>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
+               debug0: debug@850000 {
+                       compatible = "arm,coresight-cpu-debug", "arm,primecell";
+                       reg = <0x00850000 0x1000>;
+                       clocks = <&rpmcc RPM_QDSS_CLK>;
+                       clock-names = "apb_pclk";
+                       cpu = <&CPU0>;
                        status = "disabled";
                };
 
-               blsp_i2c2: i2c@78b6000 {
-                       compatible = "qcom,i2c-qup-v2.2.1";
-                       reg = <0x078b6000 0x500>;
-                       interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
-                       pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&i2c2_default>;
-                       pinctrl-1 = <&i2c2_sleep>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
+               debug1: debug@852000 {
+                       compatible = "arm,coresight-cpu-debug", "arm,primecell";
+                       reg = <0x00852000 0x1000>;
+                       clocks = <&rpmcc RPM_QDSS_CLK>;
+                       clock-names = "apb_pclk";
+                       cpu = <&CPU1>;
                        status = "disabled";
                };
 
-               blsp_i2c4: i2c@78b8000 {
-                       compatible = "qcom,i2c-qup-v2.2.1";
-                       reg = <0x078b8000 0x500>;
-                       interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP4_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
-                       pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&i2c4_default>;
-                       pinctrl-1 = <&i2c4_sleep>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
+               debug2: debug@854000 {
+                       compatible = "arm,coresight-cpu-debug", "arm,primecell";
+                       reg = <0x00854000 0x1000>;
+                       clocks = <&rpmcc RPM_QDSS_CLK>;
+                       clock-names = "apb_pclk";
+                       cpu = <&CPU2>;
                        status = "disabled";
                };
 
-               blsp_i2c5: i2c@78b9000 {
-                       compatible = "qcom,i2c-qup-v2.2.1";
-                       reg = <0x078b9000 0x500>;
-                       interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP5_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
-                       pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&i2c5_default>;
-                       pinctrl-1 = <&i2c5_sleep>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
+               debug3: debug@856000 {
+                       compatible = "arm,coresight-cpu-debug", "arm,primecell";
+                       reg = <0x00856000 0x1000>;
+                       clocks = <&rpmcc RPM_QDSS_CLK>;
+                       clock-names = "apb_pclk";
+                       cpu = <&CPU3>;
                        status = "disabled";
                };
 
-               blsp_i2c6: i2c@78ba000 {
-                       compatible = "qcom,i2c-qup-v2.2.1";
-                       reg = <0x078ba000 0x500>;
-                       interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP6_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
-                       pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&i2c6_default>;
-                       pinctrl-1 = <&i2c6_sleep>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
+               /* Core CTIs; CTIs 12-15 */
+               /* CTI - CPU-0 */
+               cti12: cti@858000 {
+                       compatible = "arm,coresight-cti-v8-arch", "arm,coresight-cti",
+                                    "arm,primecell";
+                       reg = <0x00858000 0x1000>;
+
+                       clocks = <&rpmcc RPM_QDSS_CLK>;
+                       clock-names = "apb_pclk";
+
+                       cpu = <&CPU0>;
+                       arm,cs-dev-assoc = <&etm0>;
+
                        status = "disabled";
                };
 
-               lpass: lpass@7708000 {
-                       status = "disabled";
-                       compatible = "qcom,lpass-cpu-apq8016";
-                       clocks = <&gcc GCC_ULTAUDIO_AHBFABRIC_IXFABRIC_CLK>,
-                                <&gcc GCC_ULTAUDIO_PCNOC_MPORT_CLK>,
-                                <&gcc GCC_ULTAUDIO_PCNOC_SWAY_CLK>,
-                                <&gcc GCC_ULTAUDIO_LPAIF_PRI_I2S_CLK>,
-                                <&gcc GCC_ULTAUDIO_LPAIF_SEC_I2S_CLK>,
-                                <&gcc GCC_ULTAUDIO_LPAIF_SEC_I2S_CLK>,
-                                <&gcc GCC_ULTAUDIO_LPAIF_AUX_I2S_CLK>;
+               /* CTI - CPU-1 */
+               cti13: cti@859000 {
+                       compatible = "arm,coresight-cti-v8-arch", "arm,coresight-cti",
+                                    "arm,primecell";
+                       reg = <0x00859000 0x1000>;
 
-                       clock-names = "ahbix-clk",
-                                       "pcnoc-mport-clk",
-                                       "pcnoc-sway-clk",
-                                       "mi2s-bit-clk0",
-                                       "mi2s-bit-clk1",
-                                       "mi2s-bit-clk2",
-                                       "mi2s-bit-clk3";
-                       #sound-dai-cells = <1>;
+                       clocks = <&rpmcc RPM_QDSS_CLK>;
+                       clock-names = "apb_pclk";
 
-                       interrupts = <0 160 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-names = "lpass-irq-lpaif";
-                       reg = <0x07708000 0x10000>;
-                       reg-names = "lpass-lpaif";
+                       cpu = <&CPU1>;
+                       arm,cs-dev-assoc = <&etm1>;
 
-                       #address-cells = <1>;
-                       #size-cells = <0>;
+                       status = "disabled";
                };
 
-                lpass_codec: codec{
-                       compatible = "qcom,msm8916-wcd-digital-codec";
-                       reg = <0x0771c000 0x400>;
-                       clocks = <&gcc GCC_ULTAUDIO_AHBFABRIC_IXFABRIC_CLK>,
-                                <&gcc GCC_CODEC_DIGCODEC_CLK>;
-                       clock-names = "ahbix-clk", "mclk";
-                       #sound-dai-cells = <1>;
-                };
+               /* CTI - CPU-2 */
+               cti14: cti@85a000 {
+                       compatible = "arm,coresight-cti-v8-arch", "arm,coresight-cti",
+                                    "arm,primecell";
+                       reg = <0x0085a000 0x1000>;
 
-               sdhc_1: sdhci@7824000 {
-                       compatible = "qcom,sdhci-msm-v4";
-                       reg = <0x07824900 0x11c>, <0x07824000 0x800>;
-                       reg-names = "hc_mem", "core_mem";
+                       clocks = <&rpmcc RPM_QDSS_CLK>;
+                       clock-names = "apb_pclk";
+
+                       cpu = <&CPU2>;
+                       arm,cs-dev-assoc = <&etm2>;
 
-                       interrupts = <0 123 IRQ_TYPE_LEVEL_HIGH>, <0 138 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-names = "hc_irq", "pwr_irq";
-                       clocks = <&gcc GCC_SDCC1_APPS_CLK>,
-                                <&gcc GCC_SDCC1_AHB_CLK>,
-                                <&xo_board>;
-                       clock-names = "core", "iface", "xo";
-                       mmc-ddr-1_8v;
-                       bus-width = <8>;
-                       non-removable;
                        status = "disabled";
                };
 
-               sdhc_2: sdhci@7864000 {
-                       compatible = "qcom,sdhci-msm-v4";
-                       reg = <0x07864900 0x11c>, <0x07864000 0x800>;
-                       reg-names = "hc_mem", "core_mem";
+               /* CTI - CPU-3 */
+               cti15: cti@85b000 {
+                       compatible = "arm,coresight-cti-v8-arch", "arm,coresight-cti",
+                                    "arm,primecell";
+                       reg = <0x0085b000 0x1000>;
+
+                       clocks = <&rpmcc RPM_QDSS_CLK>;
+                       clock-names = "apb_pclk";
+
+                       cpu = <&CPU3>;
+                       arm,cs-dev-assoc = <&etm3>;
 
-                       interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH>, <0 221 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-names = "hc_irq", "pwr_irq";
-                       clocks = <&gcc GCC_SDCC2_APPS_CLK>,
-                                <&gcc GCC_SDCC2_AHB_CLK>,
-                                <&xo_board>;
-                       clock-names = "core", "iface", "xo";
-                       bus-width = <4>;
                        status = "disabled";
                };
 
-               otg: usb@78d9000 {
-                       compatible = "qcom,ci-hdrc";
-                       reg = <0x78d9000 0x200>,
-                             <0x78d9200 0x200>;
-                       interrupts = <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_USB_HS_AHB_CLK>,
-                                <&gcc GCC_USB_HS_SYSTEM_CLK>;
-                       clock-names = "iface", "core";
-                       assigned-clocks = <&gcc GCC_USB_HS_SYSTEM_CLK>;
-                       assigned-clock-rates = <80000000>;
-                       resets = <&gcc GCC_USB_HS_BCR>;
-                       reset-names = "core";
-                       phy_type = "ulpi";
-                       dr_mode = "otg";
-                       ahb-burst-config = <0>;
-                       phy-names = "usb-phy";
-                       phys = <&usb_hs_phy>;
+               etm0: etm@85c000 {
+                       compatible = "arm,coresight-etm4x", "arm,primecell";
+                       reg = <0x0085c000 0x1000>;
+
+                       clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
+                       clock-names = "apb_pclk", "atclk";
+                       arm,coresight-loses-context-with-cpu;
+
+                       cpu = <&CPU0>;
+
                        status = "disabled";
-                       #reset-cells = <1>;
 
-                       ulpi {
-                               usb_hs_phy: phy {
-                                       compatible = "qcom,usb-hs-phy-msm8916",
-                                                    "qcom,usb-hs-phy";
-                                       #phy-cells = <0>;
-                                       clocks = <&xo_board>, <&gcc GCC_USB2A_PHY_SLEEP_CLK>;
-                                       clock-names = "ref", "sleep";
-                                       resets = <&gcc GCC_USB2A_PHY_BCR>, <&otg 0>;
-                                       reset-names = "phy", "por";
-                                       qcom,init-seq = /bits/ 8 <0x0 0x44
-                                               0x1 0x6b 0x2 0x24 0x3 0x13>;
+                       out-ports {
+                               port {
+                                       etm0_out: endpoint {
+                                               remote-endpoint = <&funnel1_in0>;
+                                       };
                                };
                        };
                };
 
-               intc: interrupt-controller@b000000 {
-                       compatible = "qcom,msm-qgic2";
-                       interrupt-controller;
-                       #interrupt-cells = <3>;
-                       reg = <0x0b000000 0x1000>, <0x0b002000 0x1000>;
-               };
+               etm1: etm@85d000 {
+                       compatible = "arm,coresight-etm4x", "arm,primecell";
+                       reg = <0x0085d000 0x1000>;
 
-               timer@b020000 {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges;
-                       compatible = "arm,armv7-timer-mem";
-                       reg = <0xb020000 0x1000>;
-                       clock-frequency = <19200000>;
+                       clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
+                       clock-names = "apb_pclk", "atclk";
+                       arm,coresight-loses-context-with-cpu;
 
-                       frame@b021000 {
-                               frame-number = <0>;
-                               interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
-                                            <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
-                               reg = <0xb021000 0x1000>,
-                                     <0xb022000 0x1000>;
-                       };
+                       cpu = <&CPU1>;
 
-                       frame@b023000 {
-                               frame-number = <1>;
-                               interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
-                               reg = <0xb023000 0x1000>;
-                               status = "disabled";
-                       };
+                       status = "disabled";
 
-                       frame@b024000 {
-                               frame-number = <2>;
-                               interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
-                               reg = <0xb024000 0x1000>;
-                               status = "disabled";
+                       out-ports {
+                               port {
+                                       etm1_out: endpoint {
+                                               remote-endpoint = <&funnel1_in1>;
+                                       };
+                               };
                        };
+               };
 
-                       frame@b025000 {
-                               frame-number = <3>;
-                               interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
-                               reg = <0xb025000 0x1000>;
-                               status = "disabled";
-                       };
+               etm2: etm@85e000 {
+                       compatible = "arm,coresight-etm4x", "arm,primecell";
+                       reg = <0x0085e000 0x1000>;
 
-                       frame@b026000 {
-                               frame-number = <4>;
-                               interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
-                               reg = <0xb026000 0x1000>;
-                               status = "disabled";
-                       };
+                       clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
+                       clock-names = "apb_pclk", "atclk";
+                       arm,coresight-loses-context-with-cpu;
 
-                       frame@b027000 {
-                               frame-number = <5>;
-                               interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
-                               reg = <0xb027000 0x1000>;
-                               status = "disabled";
+                       cpu = <&CPU2>;
+
+                       status = "disabled";
+
+                       out-ports {
+                               port {
+                                       etm2_out: endpoint {
+                                               remote-endpoint = <&funnel1_in2>;
+                                       };
+                               };
                        };
+               };
 
-                       frame@b028000 {
-                               frame-number = <6>;
-                               interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
-                               reg = <0xb028000 0x1000>;
-                               status = "disabled";
+               etm3: etm@85f000 {
+                       compatible = "arm,coresight-etm4x", "arm,primecell";
+                       reg = <0x0085f000 0x1000>;
+
+                       clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
+                       clock-names = "apb_pclk", "atclk";
+                       arm,coresight-loses-context-with-cpu;
+
+                       cpu = <&CPU3>;
+
+                       status = "disabled";
+
+                       out-ports {
+                               port {
+                                       etm3_out: endpoint {
+                                               remote-endpoint = <&funnel1_in3>;
+                                       };
+                               };
                        };
                };
 
-               spmi_bus: spmi@200f000 {
-                       compatible = "qcom,spmi-pmic-arb";
-                       reg = <0x200f000 0x001000>,
-                             <0x2400000 0x400000>,
-                             <0x2c00000 0x400000>,
-                             <0x3800000 0x200000>,
-                             <0x200a000 0x002100>;
-                       reg-names = "core", "chnls", "obsrvr", "intr", "cnfg";
-                       interrupt-names = "periph_irq";
-                       interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
-                       qcom,ee = <0>;
-                       qcom,channel = <0>;
-                       #address-cells = <2>;
-                       #size-cells = <0>;
+               msmgpio: pinctrl@1000000 {
+                       compatible = "qcom,msm8916-pinctrl";
+                       reg = <0x01000000 0x300000>;
+                       interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
+                       gpio-controller;
+                       gpio-ranges = <&msmgpio 0 0 122>;
+                       #gpio-cells = <2>;
                        interrupt-controller;
-                       #interrupt-cells = <4>;
+                       #interrupt-cells = <2>;
                };
 
-               rng@22000 {
-                       compatible = "qcom,prng";
-                       reg = <0x00022000 0x200>;
-                       clocks = <&gcc GCC_PRNG_AHB_CLK>;
-                       clock-names = "core";
+               gcc: clock-controller@1800000 {
+                       compatible = "qcom,gcc-msm8916";
+                       #clock-cells = <1>;
+                       #reset-cells = <1>;
+                       #power-domain-cells = <1>;
+                       reg = <0x01800000 0x80000>;
                };
 
-               qfprom: qfprom@5c000 {
-                       compatible = "qcom,qfprom";
-                       reg = <0x5c000 0x1000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       tsens_caldata: caldata@d0 {
-                               reg = <0xd0 0x8>;
-                       };
-                       tsens_calsel: calsel@ec {
-                               reg = <0xec 0x4>;
-                       };
+               tcsr_mutex: hwlock@1905000 {
+                       compatible = "qcom,tcsr-mutex";
+                       reg = <0x01905000 0x20000>;
+                       #hwlock-cells = <1>;
                };
 
-               tsens: thermal-sensor@4a9000 {
-                       compatible = "qcom,msm8916-tsens", "qcom,tsens-v0_1";
-                       reg = <0x4a9000 0x1000>, /* TM */
-                             <0x4a8000 0x1000>; /* SROT */
-                       nvmem-cells = <&tsens_caldata>, <&tsens_calsel>;
-                       nvmem-cell-names = "calib", "calib_sel";
-                       #qcom,sensors = <5>;
-                       interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-names = "uplow";
-                       #thermal-sensor-cells = <1>;
+               tcsr: syscon@1937000 {
+                       compatible = "qcom,tcsr-msm8916", "syscon";
+                       reg = <0x01937000 0x30000>;
                };
 
-               apps_iommu: iommu@1ef0000 {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       #iommu-cells = <1>;
-                       compatible = "qcom,msm8916-iommu", "qcom,msm-iommu-v1";
-                       ranges = <0 0x1e20000 0x40000>;
-                       reg = <0x1ef0000 0x3000>;
-                       clocks = <&gcc GCC_SMMU_CFG_CLK>,
-                                <&gcc GCC_APSS_TCU_CLK>;
-                       clock-names = "iface", "bus";
-                       qcom,iommu-secure-id = <17>;
+               mdss: mdss@1a00000 {
+                       compatible = "qcom,mdss";
+                       reg = <0x01a00000 0x1000>,
+                             <0x01ac8000 0x3000>;
+                       reg-names = "mdss_phys", "vbif_phys";
 
-                       // vfe:
-                       iommu-ctx@3000 {
-                               compatible = "qcom,msm-iommu-v1-sec";
-                               reg = <0x3000 0x1000>;
-                               interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
-                       };
+                       power-domains = <&gcc MDSS_GDSC>;
 
-                       // mdp_0:
-                       iommu-ctx@4000 {
-                               compatible = "qcom,msm-iommu-v1-ns";
-                               reg = <0x4000 0x1000>;
-                               interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
-                       };
+                       clocks = <&gcc GCC_MDSS_AHB_CLK>,
+                                <&gcc GCC_MDSS_AXI_CLK>,
+                                <&gcc GCC_MDSS_VSYNC_CLK>;
+                       clock-names = "iface",
+                                     "bus",
+                                     "vsync";
 
-                       // venus_ns:
-                       iommu-ctx@5000 {
-                               compatible = "qcom,msm-iommu-v1-sec";
-                               reg = <0x5000 0x1000>;
-                               interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
-                       };
-               };
+                       interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <1>;
 
-               gpu_iommu: iommu@1f08000 {
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       #iommu-cells = <1>;
-                       compatible = "qcom,msm8916-iommu", "qcom,msm-iommu-v1";
-                       ranges = <0 0x1f08000 0x10000>;
-                       clocks = <&gcc GCC_SMMU_CFG_CLK>,
-                                <&gcc GCC_GFX_TCU_CLK>;
-                       clock-names = "iface", "bus";
-                       qcom,iommu-secure-id = <18>;
+                       ranges;
 
-                       // gfx3d_user:
-                       iommu-ctx@1000 {
-                               compatible = "qcom,msm-iommu-v1-ns";
-                               reg = <0x1000 0x1000>;
-                               interrupts = <GIC_SPI 241 IRQ_TYPE_LEVEL_HIGH>;
-                       };
+                       mdp: mdp@1a01000 {
+                               compatible = "qcom,mdp5";
+                               reg = <0x01a01000 0x89000>;
+                               reg-names = "mdp_phys";
 
-                       // gfx3d_priv:
-                       iommu-ctx@2000 {
-                               compatible = "qcom,msm-iommu-v1-ns";
-                               reg = <0x2000 0x1000>;
-                               interrupts = <GIC_SPI 242 IRQ_TYPE_LEVEL_HIGH>;
-                       };
-               };
-
-               gpu@1c00000 {
-                       compatible = "qcom,adreno-306.0", "qcom,adreno";
-                       reg = <0x01c00000 0x20000>;
-                       reg-names = "kgsl_3d0_reg_memory";
-                       interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-names = "kgsl_3d0_irq";
-                       clock-names =
-                           "core",
-                           "iface",
-                           "mem",
-                           "mem_iface",
-                           "alt_mem_iface",
-                           "gfx3d";
-                       clocks =
-                           <&gcc GCC_OXILI_GFX3D_CLK>,
-                           <&gcc GCC_OXILI_AHB_CLK>,
-                           <&gcc GCC_OXILI_GMEM_CLK>,
-                           <&gcc GCC_BIMC_GFX_CLK>,
-                           <&gcc GCC_BIMC_GPU_CLK>,
-                           <&gcc GFX3D_CLK_SRC>;
-                       power-domains = <&gcc OXILI_GDSC>;
-                       operating-points-v2 = <&gpu_opp_table>;
-                       iommus = <&gpu_iommu 1>, <&gpu_iommu 2>;
-
-                       gpu_opp_table: opp-table {
-                               compatible = "operating-points-v2";
-
-                               opp-400000000 {
-                                       opp-hz = /bits/ 64 <400000000>;
-                               };
-                               opp-19200000 {
-                                       opp-hz = /bits/ 64 <19200000>;
-                               };
-                       };
-               };
-
-               mdss: mdss@1a00000 {
-                       compatible = "qcom,mdss";
-                       reg = <0x1a00000 0x1000>,
-                             <0x1ac8000 0x3000>;
-                       reg-names = "mdss_phys", "vbif_phys";
-
-                       power-domains = <&gcc MDSS_GDSC>;
-
-                       clocks = <&gcc GCC_MDSS_AHB_CLK>,
-                                <&gcc GCC_MDSS_AXI_CLK>,
-                                <&gcc GCC_MDSS_VSYNC_CLK>;
-                       clock-names = "iface",
-                                     "bus",
-                                     "vsync";
-
-                       interrupts = <0 72 IRQ_TYPE_LEVEL_HIGH>;
-
-                       interrupt-controller;
-                       #interrupt-cells = <1>;
-
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges;
-
-                       mdp: mdp@1a01000 {
-                               compatible = "qcom,mdp5";
-                               reg = <0x1a01000 0x89000>;
-                               reg-names = "mdp_phys";
-
-                               interrupt-parent = <&mdss>;
-                               interrupts = <0 0>;
+                               interrupt-parent = <&mdss>;
+                               interrupts = <0>;
 
                                clocks = <&gcc GCC_MDSS_AHB_CLK>,
                                         <&gcc GCC_MDSS_AXI_CLK>,
 
                        dsi0: dsi@1a98000 {
                                compatible = "qcom,mdss-dsi-ctrl";
-                               reg = <0x1a98000 0x25c>;
+                               reg = <0x01a98000 0x25c>;
                                reg-names = "dsi_ctrl";
 
                                interrupt-parent = <&mdss>;
-                               interrupts = <4 0>;
+                               interrupts = <4>;
 
                                assigned-clocks = <&gcc BYTE0_CLK_SRC>,
                                                  <&gcc PCLK0_CLK_SRC>;
                                phys = <&dsi_phy0>;
                                phy-names = "dsi-phy";
 
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
                                ports {
                                        #address-cells = <1>;
                                        #size-cells = <0>;
 
                        dsi_phy0: dsi-phy@1a98300 {
                                compatible = "qcom,dsi-phy-28nm-lp";
-                               reg = <0x1a98300 0xd4>,
-                                     <0x1a98500 0x280>,
-                                     <0x1a98780 0x30>;
+                               reg = <0x01a98300 0xd4>,
+                                     <0x01a98500 0x280>,
+                                     <0x01a98780 0x30>;
                                reg-names = "dsi_pll",
                                            "dsi_phy",
                                            "dsi_phy_regulator";
                        };
                };
 
+               camss: camss@1b00000 {
+                       compatible = "qcom,msm8916-camss";
+                       reg = <0x01b0ac00 0x200>,
+                               <0x01b00030 0x4>,
+                               <0x01b0b000 0x200>,
+                               <0x01b00038 0x4>,
+                               <0x01b08000 0x100>,
+                               <0x01b08400 0x100>,
+                               <0x01b0a000 0x500>,
+                               <0x01b00020 0x10>,
+                               <0x01b10000 0x1000>;
+                       reg-names = "csiphy0",
+                               "csiphy0_clk_mux",
+                               "csiphy1",
+                               "csiphy1_clk_mux",
+                               "csid0",
+                               "csid1",
+                               "ispif",
+                               "csi_clk_mux",
+                               "vfe0";
+                       interrupts = <GIC_SPI 78 IRQ_TYPE_EDGE_RISING>,
+                               <GIC_SPI 79 IRQ_TYPE_EDGE_RISING>,
+                               <GIC_SPI 51 IRQ_TYPE_EDGE_RISING>,
+                               <GIC_SPI 52 IRQ_TYPE_EDGE_RISING>,
+                               <GIC_SPI 55 IRQ_TYPE_EDGE_RISING>,
+                               <GIC_SPI 57 IRQ_TYPE_EDGE_RISING>;
+                       interrupt-names = "csiphy0",
+                               "csiphy1",
+                               "csid0",
+                               "csid1",
+                               "ispif",
+                               "vfe0";
+                       power-domains = <&gcc VFE_GDSC>;
+                       clocks = <&gcc GCC_CAMSS_TOP_AHB_CLK>,
+                               <&gcc GCC_CAMSS_ISPIF_AHB_CLK>,
+                               <&gcc GCC_CAMSS_CSI0PHYTIMER_CLK>,
+                               <&gcc GCC_CAMSS_CSI1PHYTIMER_CLK>,
+                               <&gcc GCC_CAMSS_CSI0_AHB_CLK>,
+                               <&gcc GCC_CAMSS_CSI0_CLK>,
+                               <&gcc GCC_CAMSS_CSI0PHY_CLK>,
+                               <&gcc GCC_CAMSS_CSI0PIX_CLK>,
+                               <&gcc GCC_CAMSS_CSI0RDI_CLK>,
+                               <&gcc GCC_CAMSS_CSI1_AHB_CLK>,
+                               <&gcc GCC_CAMSS_CSI1_CLK>,
+                               <&gcc GCC_CAMSS_CSI1PHY_CLK>,
+                               <&gcc GCC_CAMSS_CSI1PIX_CLK>,
+                               <&gcc GCC_CAMSS_CSI1RDI_CLK>,
+                               <&gcc GCC_CAMSS_AHB_CLK>,
+                               <&gcc GCC_CAMSS_VFE0_CLK>,
+                               <&gcc GCC_CAMSS_CSI_VFE0_CLK>,
+                               <&gcc GCC_CAMSS_VFE_AHB_CLK>,
+                               <&gcc GCC_CAMSS_VFE_AXI_CLK>;
+                       clock-names = "top_ahb",
+                               "ispif_ahb",
+                               "csiphy0_timer",
+                               "csiphy1_timer",
+                               "csi0_ahb",
+                               "csi0",
+                               "csi0_phy",
+                               "csi0_pix",
+                               "csi0_rdi",
+                               "csi1_ahb",
+                               "csi1",
+                               "csi1_phy",
+                               "csi1_pix",
+                               "csi1_rdi",
+                               "ahb",
+                               "vfe0",
+                               "csi_vfe0",
+                               "vfe_ahb",
+                               "vfe_axi";
+                       iommus = <&apps_iommu 3>;
+                       status = "disabled";
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                       };
+               };
 
-               hexagon@4080000 {
-                       compatible = "qcom,q6v5-pil";
-                       reg = <0x04080000 0x100>,
-                             <0x04020000 0x040>;
+               cci: cci@1b0c000 {
+                       compatible = "qcom,msm8916-cci";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x01b0c000 0x1000>;
+                       interrupts = <GIC_SPI 50 IRQ_TYPE_EDGE_RISING>;
+                       clocks = <&gcc GCC_CAMSS_TOP_AHB_CLK>,
+                               <&gcc GCC_CAMSS_CCI_AHB_CLK>,
+                               <&gcc GCC_CAMSS_CCI_CLK>,
+                               <&gcc GCC_CAMSS_AHB_CLK>;
+                       clock-names = "camss_top_ahb", "cci_ahb",
+                                         "cci", "camss_ahb";
+                       assigned-clocks = <&gcc GCC_CAMSS_CCI_AHB_CLK>,
+                                         <&gcc GCC_CAMSS_CCI_CLK>;
+                       assigned-clock-rates = <80000000>, <19200000>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&cci0_default>;
+                       status = "disabled";
 
-                       reg-names = "qdsp6", "rmb";
+                       cci_i2c0: i2c-bus@0 {
+                               reg = <0>;
+                               clock-frequency = <400000>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                       };
+               };
 
-                       interrupts-extended = <&intc 0 24 1>,
-                                             <&hexagon_smp2p_in 0 0>,
-                                             <&hexagon_smp2p_in 1 0>,
-                                             <&hexagon_smp2p_in 2 0>,
-                                             <&hexagon_smp2p_in 3 0>;
-                       interrupt-names = "wdog", "fatal", "ready",
-                                         "handover", "stop-ack";
+               gpu@1c00000 {
+                       compatible = "qcom,adreno-306.0", "qcom,adreno";
+                       reg = <0x01c00000 0x20000>;
+                       reg-names = "kgsl_3d0_reg_memory";
+                       interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "kgsl_3d0_irq";
+                       clock-names =
+                           "core",
+                           "iface",
+                           "mem",
+                           "mem_iface",
+                           "alt_mem_iface",
+                           "gfx3d";
+                       clocks =
+                           <&gcc GCC_OXILI_GFX3D_CLK>,
+                           <&gcc GCC_OXILI_AHB_CLK>,
+                           <&gcc GCC_OXILI_GMEM_CLK>,
+                           <&gcc GCC_BIMC_GFX_CLK>,
+                           <&gcc GCC_BIMC_GPU_CLK>,
+                           <&gcc GFX3D_CLK_SRC>;
+                       power-domains = <&gcc OXILI_GDSC>;
+                       operating-points-v2 = <&gpu_opp_table>;
+                       iommus = <&gpu_iommu 1>, <&gpu_iommu 2>;
 
-                       clocks = <&gcc GCC_MSS_CFG_AHB_CLK>,
-                                <&gcc GCC_MSS_Q6_BIMC_AXI_CLK>,
-                                <&gcc GCC_BOOT_ROM_AHB_CLK>,
-                                <&xo_board>;
-                       clock-names = "iface", "bus", "mem", "xo";
+                       gpu_opp_table: opp-table {
+                               compatible = "operating-points-v2";
 
-                       qcom,smem-states = <&hexagon_smp2p_out 0>;
-                       qcom,smem-state-names = "stop";
+                               opp-400000000 {
+                                       opp-hz = /bits/ 64 <400000000>;
+                               };
+                               opp-19200000 {
+                                       opp-hz = /bits/ 64 <19200000>;
+                               };
+                       };
+               };
 
-                       resets = <&scm 0>;
-                       reset-names = "mss_restart";
+               venus: video-codec@1d00000 {
+                       compatible = "qcom,msm8916-venus";
+                       reg = <0x01d00000 0xff000>;
+                       interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
+                       power-domains = <&gcc VENUS_GDSC>;
+                       clocks = <&gcc GCC_VENUS0_VCODEC0_CLK>,
+                                <&gcc GCC_VENUS0_AHB_CLK>,
+                                <&gcc GCC_VENUS0_AXI_CLK>;
+                       clock-names = "core", "iface", "bus";
+                       iommus = <&apps_iommu 5>;
+                       memory-region = <&venus_mem>;
+                       status = "okay";
 
-                       cx-supply = <&pm8916_s1>;
-                       mx-supply = <&pm8916_l3>;
-                       pll-supply = <&pm8916_l7>;
+                       video-decoder {
+                               compatible = "venus-decoder";
+                       };
 
-                       qcom,halt-regs = <&tcsr 0x18000 0x19000 0x1a000>;
+                       video-encoder {
+                               compatible = "venus-encoder";
+                       };
+               };
 
-                       status = "disabled";
+               apps_iommu: iommu@1ef0000 {
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       #iommu-cells = <1>;
+                       compatible = "qcom,msm8916-iommu", "qcom,msm-iommu-v1";
+                       ranges = <0 0x01e20000 0x40000>;
+                       reg = <0x01ef0000 0x3000>;
+                       clocks = <&gcc GCC_SMMU_CFG_CLK>,
+                                <&gcc GCC_APSS_TCU_CLK>;
+                       clock-names = "iface", "bus";
+                       qcom,iommu-secure-id = <17>;
 
-                       mba {
-                               memory-region = <&mba_mem>;
+                       // vfe:
+                       iommu-ctx@3000 {
+                               compatible = "qcom,msm-iommu-v1-sec";
+                               reg = <0x3000 0x1000>;
+                               interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
                        };
 
-                       mpss {
-                               memory-region = <&mpss_mem>;
+                       // mdp_0:
+                       iommu-ctx@4000 {
+                               compatible = "qcom,msm-iommu-v1-ns";
+                               reg = <0x4000 0x1000>;
+                               interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
                        };
 
-                       smd-edge {
-                               interrupts = <0 25 IRQ_TYPE_EDGE_RISING>;
-
-                               qcom,smd-edge = <0>;
-                               qcom,ipc = <&apcs 8 12>;
-                               qcom,remote-pid = <1>;
-
-                               label = "hexagon";
+                       // venus_ns:
+                       iommu-ctx@5000 {
+                               compatible = "qcom,msm-iommu-v1-sec";
+                               reg = <0x5000 0x1000>;
+                               interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
+                       };
+               };
 
-                               fastrpc {
-                                       compatible = "qcom,fastrpc";
-                                       qcom,smd-channels = "fastrpcsmd-apps-dsp";
-                                       label = "adsp";
+               gpu_iommu: iommu@1f08000 {
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       #iommu-cells = <1>;
+                       compatible = "qcom,msm8916-iommu", "qcom,msm-iommu-v1";
+                       ranges = <0 0x01f08000 0x10000>;
+                       clocks = <&gcc GCC_SMMU_CFG_CLK>,
+                                <&gcc GCC_GFX_TCU_CLK>;
+                       clock-names = "iface", "bus";
+                       qcom,iommu-secure-id = <18>;
 
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
+                       // gfx3d_user:
+                       iommu-ctx@1000 {
+                               compatible = "qcom,msm-iommu-v1-ns";
+                               reg = <0x1000 0x1000>;
+                               interrupts = <GIC_SPI 241 IRQ_TYPE_LEVEL_HIGH>;
+                       };
 
-                                       cb@1{
-                                               compatible = "qcom,fastrpc-compute-cb";
-                                               reg = <1>;
-                                       };
-                               };
+                       // gfx3d_priv:
+                       iommu-ctx@2000 {
+                               compatible = "qcom,msm-iommu-v1-ns";
+                               reg = <0x2000 0x1000>;
+                               interrupts = <GIC_SPI 242 IRQ_TYPE_LEVEL_HIGH>;
                        };
                };
 
-               pronto: wcnss@a21b000 {
-                       compatible = "qcom,pronto-v2-pil", "qcom,pronto";
-                       reg = <0x0a204000 0x2000>, <0x0a202000 0x1000>, <0x0a21b000 0x3000>;
-                       reg-names = "ccu", "dxe", "pmu";
+               spmi_bus: spmi@200f000 {
+                       compatible = "qcom,spmi-pmic-arb";
+                       reg = <0x0200f000 0x001000>,
+                             <0x02400000 0x400000>,
+                             <0x02c00000 0x400000>,
+                             <0x03800000 0x200000>,
+                             <0x0200a000 0x002100>;
+                       reg-names = "core", "chnls", "obsrvr", "intr", "cnfg";
+                       interrupt-names = "periph_irq";
+                       interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
+                       qcom,ee = <0>;
+                       qcom,channel = <0>;
+                       #address-cells = <2>;
+                       #size-cells = <0>;
+                       interrupt-controller;
+                       #interrupt-cells = <4>;
+               };
 
-                       memory-region = <&wcnss_mem>;
+               mpss: remoteproc@4080000 {
+                       compatible = "qcom,msm8916-mss-pil", "qcom,q6v5-pil";
+                       reg = <0x04080000 0x100>,
+                             <0x04020000 0x040>;
 
-                       interrupts-extended = <&intc 0 149 IRQ_TYPE_EDGE_RISING>,
-                                             <&wcnss_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
-                                             <&wcnss_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
-                                             <&wcnss_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
-                                             <&wcnss_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;
-                       interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack";
+                       reg-names = "qdsp6", "rmb";
 
-                       vddmx-supply = <&pm8916_l3>;
-                       vddpx-supply = <&pm8916_l7>;
+                       interrupts-extended = <&intc GIC_SPI 24 IRQ_TYPE_EDGE_RISING>,
+                                             <&hexagon_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
+                                             <&hexagon_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
+                                             <&hexagon_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
+                                             <&hexagon_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;
+                       interrupt-names = "wdog", "fatal", "ready",
+                                         "handover", "stop-ack";
 
-                       qcom,state = <&wcnss_smp2p_out 0>;
-                       qcom,state-names = "stop";
+                       clocks = <&gcc GCC_MSS_CFG_AHB_CLK>,
+                                <&gcc GCC_MSS_Q6_BIMC_AXI_CLK>,
+                                <&gcc GCC_BOOT_ROM_AHB_CLK>,
+                                <&xo_board>;
+                       clock-names = "iface", "bus", "mem", "xo";
 
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&wcnss_pin_a>;
+                       qcom,smem-states = <&hexagon_smp2p_out 0>;
+                       qcom,smem-state-names = "stop";
 
-                       status = "disabled";
+                       resets = <&scm 0>;
+                       reset-names = "mss_restart";
 
-                       iris {
-                               compatible = "qcom,wcn3620";
+                       qcom,halt-regs = <&tcsr 0x18000 0x19000 0x1a000>;
 
-                               clocks = <&rpmcc RPM_SMD_RF_CLK2>;
-                               clock-names = "xo";
+                       status = "disabled";
 
-                               vddxo-supply = <&pm8916_l7>;
-                               vddrfa-supply = <&pm8916_s3>;
-                               vddpa-supply = <&pm8916_l9>;
-                               vdddig-supply = <&pm8916_l5>;
+                       mba {
+                               memory-region = <&mba_mem>;
                        };
 
-                       smd-edge {
-                               interrupts = <0 142 1>;
-
-                               qcom,ipc = <&apcs 8 17>;
-                               qcom,smd-edge = <6>;
-                               qcom,remote-pid = <4>;
-
-                               label = "pronto";
+                       mpss {
+                               memory-region = <&mpss_mem>;
+                       };
 
-                               wcnss {
-                                       compatible = "qcom,wcnss";
-                                       qcom,smd-channels = "WCNSS_CTRL";
+                       smd-edge {
+                               interrupts = <GIC_SPI 25 IRQ_TYPE_EDGE_RISING>;
 
-                                       qcom,mmio = <&pronto>;
+                               qcom,smd-edge = <0>;
+                               qcom,ipc = <&apcs 8 12>;
+                               qcom,remote-pid = <1>;
 
-                                       bt {
-                                               compatible = "qcom,wcnss-bt";
-                                       };
+                               label = "hexagon";
 
-                                       wifi {
-                                               compatible = "qcom,wcnss-wlan";
+                               fastrpc {
+                                       compatible = "qcom,fastrpc";
+                                       qcom,smd-channels = "fastrpcsmd-apps-dsp";
+                                       label = "adsp";
 
-                                               interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>,
-                                                            <0 146 IRQ_TYPE_LEVEL_HIGH>;
-                                               interrupt-names = "tx", "rx";
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
 
-                                               qcom,smem-states = <&apps_smsm 10>, <&apps_smsm 9>;
-                                               qcom,smem-state-names = "tx-enable", "tx-rings-empty";
+                                       cb@1 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <1>;
                                        };
                                };
                        };
                };
 
-               tpiu@820000 {
-                       compatible = "arm,coresight-tpiu", "arm,primecell";
-                       reg = <0x820000 0x1000>;
-
-                       clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
-                       clock-names = "apb_pclk", "atclk";
-
+               sound: sound@7702000 {
                        status = "disabled";
-
-                       in-ports {
-                               port {
-                                       tpiu_in: endpoint {
-                                               remote-endpoint = <&replicator_out1>;
-                                       };
-                               };
-                       };
+                       compatible = "qcom,apq8016-sbc-sndcard";
+                       reg = <0x07702000 0x4>, <0x07702004 0x4>;
+                       reg-names = "mic-iomux", "spkr-iomux";
                };
 
-               funnel@821000 {
-                       compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
-                       reg = <0x821000 0x1000>;
-
-                       clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
-                       clock-names = "apb_pclk", "atclk";
-
+               lpass: audio-controller@7708000 {
                        status = "disabled";
+                       compatible = "qcom,lpass-cpu-apq8016";
+                       clocks = <&gcc GCC_ULTAUDIO_AHBFABRIC_IXFABRIC_CLK>,
+                                <&gcc GCC_ULTAUDIO_PCNOC_MPORT_CLK>,
+                                <&gcc GCC_ULTAUDIO_PCNOC_SWAY_CLK>,
+                                <&gcc GCC_ULTAUDIO_LPAIF_PRI_I2S_CLK>,
+                                <&gcc GCC_ULTAUDIO_LPAIF_SEC_I2S_CLK>,
+                                <&gcc GCC_ULTAUDIO_LPAIF_SEC_I2S_CLK>,
+                                <&gcc GCC_ULTAUDIO_LPAIF_AUX_I2S_CLK>;
 
-                       in-ports {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               /*
-                                * Not described input ports:
-                                * 0 - connected to Resource and Power Manger CPU ETM
-                                * 1 - not-connected
-                                * 2 - connected to Modem CPU ETM
-                                * 3 - not-connected
-                                * 5 - not-connected
-                                * 6 - connected trought funnel to Wireless CPU ETM
-                                * 7 - connected to STM component
-                                */
+                       clock-names = "ahbix-clk",
+                                       "pcnoc-mport-clk",
+                                       "pcnoc-sway-clk",
+                                       "mi2s-bit-clk0",
+                                       "mi2s-bit-clk1",
+                                       "mi2s-bit-clk2",
+                                       "mi2s-bit-clk3";
+                       #sound-dai-cells = <1>;
 
-                               port@4 {
-                                       reg = <4>;
-                                       funnel0_in4: endpoint {
-                                               remote-endpoint = <&funnel1_out>;
-                                       };
-                               };
-                       };
+                       interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "lpass-irq-lpaif";
+                       reg = <0x07708000 0x10000>;
+                       reg-names = "lpass-lpaif";
 
-                       out-ports {
-                               port {
-                                       funnel0_out: endpoint {
-                                               remote-endpoint = <&etf_in>;
-                                       };
-                               };
-                       };
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                };
 
-               replicator@824000 {
-                       compatible = "arm,coresight-dynamic-replicator", "arm,primecell";
-                       reg = <0x824000 0x1000>;
+               lpass_codec: audio-codec@771c000 {
+                       compatible = "qcom,msm8916-wcd-digital-codec";
+                       reg = <0x0771c000 0x400>;
+                       clocks = <&gcc GCC_ULTAUDIO_AHBFABRIC_IXFABRIC_CLK>,
+                                <&gcc GCC_CODEC_DIGCODEC_CLK>;
+                       clock-names = "ahbix-clk", "mclk";
+                       #sound-dai-cells = <1>;
+               };
 
-                       clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
-                       clock-names = "apb_pclk", "atclk";
+               sdhc_1: sdhci@7824000 {
+                       compatible = "qcom,sdhci-msm-v4";
+                       reg = <0x07824900 0x11c>, <0x07824000 0x800>;
+                       reg-names = "hc_mem", "core_mem";
 
+                       interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "hc_irq", "pwr_irq";
+                       clocks = <&gcc GCC_SDCC1_APPS_CLK>,
+                                <&gcc GCC_SDCC1_AHB_CLK>,
+                                <&xo_board>;
+                       clock-names = "core", "iface", "xo";
+                       mmc-ddr-1_8v;
+                       bus-width = <8>;
+                       non-removable;
                        status = "disabled";
-
-                       out-ports {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               port@0 {
-                                       reg = <0>;
-                                       replicator_out0: endpoint {
-                                               remote-endpoint = <&etr_in>;
-                                       };
-                               };
-                               port@1 {
-                                       reg = <1>;
-                                       replicator_out1: endpoint {
-                                               remote-endpoint = <&tpiu_in>;
-                                       };
-                               };
-                       };
-
-                       in-ports {
-                               port {
-                                       replicator_in: endpoint {
-                                               remote-endpoint = <&etf_out>;
-                                       };
-                               };
-                       };
                };
 
-               etf@825000 {
-                       compatible = "arm,coresight-tmc", "arm,primecell";
-                       reg = <0x825000 0x1000>;
-
-                       clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
-                       clock-names = "apb_pclk", "atclk";
+               sdhc_2: sdhci@7864000 {
+                       compatible = "qcom,sdhci-msm-v4";
+                       reg = <0x07864900 0x11c>, <0x07864000 0x800>;
+                       reg-names = "hc_mem", "core_mem";
 
+                       interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "hc_irq", "pwr_irq";
+                       clocks = <&gcc GCC_SDCC2_APPS_CLK>,
+                                <&gcc GCC_SDCC2_AHB_CLK>,
+                                <&xo_board>;
+                       clock-names = "core", "iface", "xo";
+                       bus-width = <4>;
                        status = "disabled";
-
-                       in-ports {
-                               port {
-                                       etf_in: endpoint {
-                                               remote-endpoint = <&funnel0_out>;
-                                       };
-                               };
-                       };
-
-                       out-ports {
-                               port {
-                                       etf_out: endpoint {
-                                               remote-endpoint = <&replicator_in>;
-                                       };
-                               };
-                       };
                };
 
-               etr@826000 {
-                       compatible = "arm,coresight-tmc", "arm,primecell";
-                       reg = <0x826000 0x1000>;
-
-                       clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
-                       clock-names = "apb_pclk", "atclk";
-
-                       status = "disabled";
-
-                       in-ports {
-                               port {
-                                       etr_in: endpoint {
-                                               remote-endpoint = <&replicator_out0>;
-                                       };
-                               };
-                       };
-               };
-
-               funnel@841000 { /* APSS funnel only 4 inputs are used */
-                       compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
-                       reg = <0x841000 0x1000>;
-
-                       clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
-                       clock-names = "apb_pclk", "atclk";
-
+               blsp_dma: dma@7884000 {
+                       compatible = "qcom,bam-v1.7.0";
+                       reg = <0x07884000 0x23000>;
+                       interrupts = <GIC_SPI 238 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "bam_clk";
+                       #dma-cells = <1>;
+                       qcom,ee = <0>;
                        status = "disabled";
-
-                       in-ports {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               port@0 {
-                                       reg = <0>;
-                                       funnel1_in0: endpoint {
-                                               remote-endpoint = <&etm0_out>;
-                                       };
-                               };
-                               port@1 {
-                                       reg = <1>;
-                                       funnel1_in1: endpoint {
-                                               remote-endpoint = <&etm1_out>;
-                                       };
-                               };
-                               port@2 {
-                                       reg = <2>;
-                                       funnel1_in2: endpoint {
-                                               remote-endpoint = <&etm2_out>;
-                                       };
-                               };
-                               port@3 {
-                                       reg = <3>;
-                                       funnel1_in3: endpoint {
-                                               remote-endpoint = <&etm3_out>;
-                                       };
-                               };
-                       };
-
-                       out-ports {
-                               port {
-                                       funnel1_out: endpoint {
-                                               remote-endpoint = <&funnel0_in4>;
-                                       };
-                               };
-                       };
                };
 
-               debug@850000 {
-                       compatible = "arm,coresight-cpu-debug","arm,primecell";
-                       reg = <0x850000 0x1000>;
-                       clocks = <&rpmcc RPM_QDSS_CLK>;
-                       clock-names = "apb_pclk";
-                       cpu = <&CPU0>;
+               blsp1_uart1: serial@78af000 {
+                       compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
+                       reg = <0x078af000 0x200>;
+                       interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&gcc GCC_BLSP1_UART1_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
+                       dmas = <&blsp_dma 1>, <&blsp_dma 0>;
+                       dma-names = "rx", "tx";
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&blsp1_uart1_default>;
+                       pinctrl-1 = <&blsp1_uart1_sleep>;
                        status = "disabled";
                };
 
-               debug@852000 {
-                       compatible = "arm,coresight-cpu-debug","arm,primecell";
-                       reg = <0x852000 0x1000>;
-                       clocks = <&rpmcc RPM_QDSS_CLK>;
-                       clock-names = "apb_pclk";
-                       cpu = <&CPU1>;
+               blsp1_uart2: serial@78b0000 {
+                       compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
+                       reg = <0x078b0000 0x200>;
+                       interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&gcc GCC_BLSP1_UART2_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
+                       dmas = <&blsp_dma 3>, <&blsp_dma 2>;
+                       dma-names = "rx", "tx";
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&blsp1_uart2_default>;
+                       pinctrl-1 = <&blsp1_uart2_sleep>;
                        status = "disabled";
                };
 
-               debug@854000 {
-                       compatible = "arm,coresight-cpu-debug","arm,primecell";
-                       reg = <0x854000 0x1000>;
-                       clocks = <&rpmcc RPM_QDSS_CLK>;
-                       clock-names = "apb_pclk";
-                       cpu = <&CPU2>;
+               blsp_i2c1: i2c@78b5000 {
+                       compatible = "qcom,i2c-qup-v2.2.1";
+                       reg = <0x078b5000 0x500>;
+                       interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
+                                <&gcc GCC_BLSP1_QUP1_I2C_APPS_CLK>;
+                       clock-names = "iface", "core";
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&i2c1_default>;
+                       pinctrl-1 = <&i2c1_sleep>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        status = "disabled";
                };
 
-               debug@856000 {
-                       compatible = "arm,coresight-cpu-debug","arm,primecell";
-                       reg = <0x856000 0x1000>;
-                       clocks = <&rpmcc RPM_QDSS_CLK>;
-                       clock-names = "apb_pclk";
-                       cpu = <&CPU3>;
+               blsp_spi1: spi@78b5000 {
+                       compatible = "qcom,spi-qup-v2.2.1";
+                       reg = <0x078b5000 0x500>;
+                       interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&gcc GCC_BLSP1_QUP1_SPI_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
+                       dmas = <&blsp_dma 5>, <&blsp_dma 4>;
+                       dma-names = "rx", "tx";
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&spi1_default>;
+                       pinctrl-1 = <&spi1_sleep>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        status = "disabled";
                };
 
-               etm0: etm@85c000 {
-                       compatible = "arm,coresight-etm4x", "arm,primecell";
-                       reg = <0x85c000 0x1000>;
-
-                       clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
-                       clock-names = "apb_pclk", "atclk";
-                       arm,coresight-loses-context-with-cpu;
-
-                       cpu = <&CPU0>;
-
+               blsp_i2c2: i2c@78b6000 {
+                       compatible = "qcom,i2c-qup-v2.2.1";
+                       reg = <0x078b6000 0x500>;
+                       interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
+                                <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>;
+                       clock-names = "iface", "core";
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&i2c2_default>;
+                       pinctrl-1 = <&i2c2_sleep>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        status = "disabled";
-
-                       out-ports {
-                               port {
-                                       etm0_out: endpoint {
-                                               remote-endpoint = <&funnel1_in0>;
-                                       };
-                               };
-                       };
                };
 
-               etm1: etm@85d000 {
-                       compatible = "arm,coresight-etm4x", "arm,primecell";
-                       reg = <0x85d000 0x1000>;
-
-                       clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
-                       clock-names = "apb_pclk", "atclk";
-                       arm,coresight-loses-context-with-cpu;
-
-                       cpu = <&CPU1>;
-
+               blsp_spi2: spi@78b6000 {
+                       compatible = "qcom,spi-qup-v2.2.1";
+                       reg = <0x078b6000 0x500>;
+                       interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&gcc GCC_BLSP1_QUP2_SPI_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
+                       dmas = <&blsp_dma 7>, <&blsp_dma 6>;
+                       dma-names = "rx", "tx";
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&spi2_default>;
+                       pinctrl-1 = <&spi2_sleep>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        status = "disabled";
-
-                       out-ports {
-                               port {
-                                       etm1_out: endpoint {
-                                               remote-endpoint = <&funnel1_in1>;
-                                       };
-                               };
-                       };
                };
 
-               etm2: etm@85e000 {
-                       compatible = "arm,coresight-etm4x", "arm,primecell";
-                       reg = <0x85e000 0x1000>;
-
-                       clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
-                       clock-names = "apb_pclk", "atclk";
-                       arm,coresight-loses-context-with-cpu;
-
-                       cpu = <&CPU2>;
-
+               blsp_spi3: spi@78b7000 {
+                       compatible = "qcom,spi-qup-v2.2.1";
+                       reg = <0x078b7000 0x500>;
+                       interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&gcc GCC_BLSP1_QUP3_SPI_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
+                       dmas = <&blsp_dma 9>, <&blsp_dma 8>;
+                       dma-names = "rx", "tx";
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&spi3_default>;
+                       pinctrl-1 = <&spi3_sleep>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        status = "disabled";
-
-                       out-ports {
-                               port {
-                                       etm2_out: endpoint {
-                                               remote-endpoint = <&funnel1_in2>;
-                                       };
-                               };
-                       };
                };
 
-               etm3: etm@85f000 {
-                       compatible = "arm,coresight-etm4x", "arm,primecell";
-                       reg = <0x85f000 0x1000>;
-
-                       clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
-                       clock-names = "apb_pclk", "atclk";
-                       arm,coresight-loses-context-with-cpu;
-
-                       cpu = <&CPU3>;
-
+               blsp_i2c4: i2c@78b8000 {
+                       compatible = "qcom,i2c-qup-v2.2.1";
+                       reg = <0x078b8000 0x500>;
+                       interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
+                                <&gcc GCC_BLSP1_QUP4_I2C_APPS_CLK>;
+                       clock-names = "iface", "core";
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&i2c4_default>;
+                       pinctrl-1 = <&i2c4_sleep>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        status = "disabled";
-
-                       out-ports {
-                               port {
-                                       etm3_out: endpoint {
-                                               remote-endpoint = <&funnel1_in3>;
-                                       };
-                               };
-                       };
                };
 
-               /* System CTIs */
-               /* CTI 0 - TMC connections */
-               cti@810000 {
-                       compatible = "arm,coresight-cti", "arm,primecell";
-                       reg = <0x810000 0x1000>;
-
-                       clocks = <&rpmcc RPM_QDSS_CLK>;
-                       clock-names = "apb_pclk";
-
+               blsp_spi4: spi@78b8000 {
+                       compatible = "qcom,spi-qup-v2.2.1";
+                       reg = <0x078b8000 0x500>;
+                       interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&gcc GCC_BLSP1_QUP4_SPI_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
+                       dmas = <&blsp_dma 11>, <&blsp_dma 10>;
+                       dma-names = "rx", "tx";
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&spi4_default>;
+                       pinctrl-1 = <&spi4_sleep>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        status = "disabled";
                };
 
-               /* CTI 1 - TPIU connections */
-               cti@811000 {
-                       compatible = "arm,coresight-cti", "arm,primecell";
-                       reg = <0x811000 0x1000>;
-
-                       clocks = <&rpmcc RPM_QDSS_CLK>;
-                       clock-names = "apb_pclk";
-
+               blsp_i2c5: i2c@78b9000 {
+                       compatible = "qcom,i2c-qup-v2.2.1";
+                       reg = <0x078b9000 0x500>;
+                       interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
+                                <&gcc GCC_BLSP1_QUP5_I2C_APPS_CLK>;
+                       clock-names = "iface", "core";
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&i2c5_default>;
+                       pinctrl-1 = <&i2c5_sleep>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        status = "disabled";
                };
 
-               /* CTIs 2-11 - no information - not instantiated */
-
-               /* Core CTIs; CTIs 12-15 */
-               /* CTI - CPU-0 */
-               cti@858000 {
-                       compatible = "arm,coresight-cti-v8-arch", "arm,coresight-cti",
-                                    "arm,primecell";
-                       reg = <0x858000 0x1000>;
-
-                       clocks = <&rpmcc RPM_QDSS_CLK>;
-                       clock-names = "apb_pclk";
-
-                       cpu = <&CPU0>;
-                       arm,cs-dev-assoc = <&etm0>;
-
+               blsp_spi5: spi@78b9000 {
+                       compatible = "qcom,spi-qup-v2.2.1";
+                       reg = <0x078b9000 0x500>;
+                       interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&gcc GCC_BLSP1_QUP5_SPI_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
+                       dmas = <&blsp_dma 13>, <&blsp_dma 12>;
+                       dma-names = "rx", "tx";
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&spi5_default>;
+                       pinctrl-1 = <&spi5_sleep>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        status = "disabled";
                };
 
-               /* CTI - CPU-1 */
-               cti@859000 {
-                       compatible = "arm,coresight-cti-v8-arch", "arm,coresight-cti",
-                                    "arm,primecell";
-                       reg = <0x859000 0x1000>;
-
-                       clocks = <&rpmcc RPM_QDSS_CLK>;
-                       clock-names = "apb_pclk";
-
-                       cpu = <&CPU1>;
-                       arm,cs-dev-assoc = <&etm1>;
-
+               blsp_i2c6: i2c@78ba000 {
+                       compatible = "qcom,i2c-qup-v2.2.1";
+                       reg = <0x078ba000 0x500>;
+                       interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
+                                <&gcc GCC_BLSP1_QUP6_I2C_APPS_CLK>;
+                       clock-names = "iface", "core";
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&i2c6_default>;
+                       pinctrl-1 = <&i2c6_sleep>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        status = "disabled";
                };
 
-               /* CTI - CPU-2 */
-               cti@85a000 {
-                       compatible = "arm,coresight-cti-v8-arch", "arm,coresight-cti",
-                                    "arm,primecell";
-                       reg = <0x85a000 0x1000>;
-
-                       clocks = <&rpmcc RPM_QDSS_CLK>;
-                       clock-names = "apb_pclk";
-
-                       cpu = <&CPU2>;
-                       arm,cs-dev-assoc = <&etm2>;
-
+               blsp_spi6: spi@78ba000 {
+                       compatible = "qcom,spi-qup-v2.2.1";
+                       reg = <0x078ba000 0x500>;
+                       interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&gcc GCC_BLSP1_QUP6_SPI_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
+                       dmas = <&blsp_dma 15>, <&blsp_dma 14>;
+                       dma-names = "rx", "tx";
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&spi6_default>;
+                       pinctrl-1 = <&spi6_sleep>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        status = "disabled";
                };
 
-               /* CTI - CPU-3 */
-               cti@85b000 {
-                       compatible = "arm,coresight-cti-v8-arch", "arm,coresight-cti",
-                                    "arm,primecell";
-                       reg = <0x85b000 0x1000>;
-
-                       clocks = <&rpmcc RPM_QDSS_CLK>;
-                       clock-names = "apb_pclk";
-
-                       cpu = <&CPU3>;
-                       arm,cs-dev-assoc = <&etm3>;
-
+               usb: usb@78d9000 {
+                       compatible = "qcom,ci-hdrc";
+                       reg = <0x078d9000 0x200>,
+                             <0x078d9200 0x200>;
+                       interrupts = <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&gcc GCC_USB_HS_AHB_CLK>,
+                                <&gcc GCC_USB_HS_SYSTEM_CLK>;
+                       clock-names = "iface", "core";
+                       assigned-clocks = <&gcc GCC_USB_HS_SYSTEM_CLK>;
+                       assigned-clock-rates = <80000000>;
+                       resets = <&gcc GCC_USB_HS_BCR>;
+                       reset-names = "core";
+                       phy_type = "ulpi";
+                       dr_mode = "otg";
+                       hnp-disable;
+                       srp-disable;
+                       adp-disable;
+                       ahb-burst-config = <0>;
+                       phy-names = "usb-phy";
+                       phys = <&usb_hs_phy>;
                        status = "disabled";
-               };
-
-
-               venus: video-codec@1d00000 {
-                       compatible = "qcom,msm8916-venus";
-                       reg = <0x01d00000 0xff000>;
-                       interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
-                       power-domains = <&gcc VENUS_GDSC>;
-                       clocks = <&gcc GCC_VENUS0_VCODEC0_CLK>,
-                                <&gcc GCC_VENUS0_AHB_CLK>,
-                                <&gcc GCC_VENUS0_AXI_CLK>;
-                       clock-names = "core", "iface", "bus";
-                       iommus = <&apps_iommu 5>;
-                       memory-region = <&venus_mem>;
-                       status = "okay";
-
-                       video-decoder {
-                               compatible = "venus-decoder";
-                       };
+                       #reset-cells = <1>;
 
-                       video-encoder {
-                               compatible = "venus-encoder";
+                       ulpi {
+                               usb_hs_phy: phy {
+                                       compatible = "qcom,usb-hs-phy-msm8916",
+                                                    "qcom,usb-hs-phy";
+                                       #phy-cells = <0>;
+                                       clocks = <&xo_board>, <&gcc GCC_USB2A_PHY_SLEEP_CLK>;
+                                       clock-names = "ref", "sleep";
+                                       resets = <&gcc GCC_USB2A_PHY_BCR>, <&usb 0>;
+                                       reset-names = "phy", "por";
+                                       qcom,init-seq = /bits/ 8 <0x0 0x44
+                                               0x1 0x6b 0x2 0x24 0x3 0x13>;
+                               };
                        };
                };
 
-               camss: camss@1b00000 {
-                       compatible = "qcom,msm8916-camss";
-                       reg = <0x1b0ac00 0x200>,
-                               <0x1b00030 0x4>,
-                               <0x1b0b000 0x200>,
-                               <0x1b00038 0x4>,
-                               <0x1b08000 0x100>,
-                               <0x1b08400 0x100>,
-                               <0x1b0a000 0x500>,
-                               <0x1b00020 0x10>,
-                               <0x1b10000 0x1000>;
-                       reg-names = "csiphy0",
-                               "csiphy0_clk_mux",
-                               "csiphy1",
-                               "csiphy1_clk_mux",
-                               "csid0",
-                               "csid1",
-                               "ispif",
-                               "csi_clk_mux",
-                               "vfe0";
-                       interrupts = <GIC_SPI 78 IRQ_TYPE_EDGE_RISING>,
-                               <GIC_SPI 79 IRQ_TYPE_EDGE_RISING>,
-                               <GIC_SPI 51 IRQ_TYPE_EDGE_RISING>,
-                               <GIC_SPI 52 IRQ_TYPE_EDGE_RISING>,
-                               <GIC_SPI 55 IRQ_TYPE_EDGE_RISING>,
-                               <GIC_SPI 57 IRQ_TYPE_EDGE_RISING>;
-                       interrupt-names = "csiphy0",
-                               "csiphy1",
-                               "csid0",
-                               "csid1",
-                               "ispif",
-                               "vfe0";
-                       power-domains = <&gcc VFE_GDSC>;
-                       clocks = <&gcc GCC_CAMSS_TOP_AHB_CLK>,
-                               <&gcc GCC_CAMSS_ISPIF_AHB_CLK>,
-                               <&gcc GCC_CAMSS_CSI0PHYTIMER_CLK>,
-                               <&gcc GCC_CAMSS_CSI1PHYTIMER_CLK>,
-                               <&gcc GCC_CAMSS_CSI0_AHB_CLK>,
-                               <&gcc GCC_CAMSS_CSI0_CLK>,
-                               <&gcc GCC_CAMSS_CSI0PHY_CLK>,
-                               <&gcc GCC_CAMSS_CSI0PIX_CLK>,
-                               <&gcc GCC_CAMSS_CSI0RDI_CLK>,
-                               <&gcc GCC_CAMSS_CSI1_AHB_CLK>,
-                               <&gcc GCC_CAMSS_CSI1_CLK>,
-                               <&gcc GCC_CAMSS_CSI1PHY_CLK>,
-                               <&gcc GCC_CAMSS_CSI1PIX_CLK>,
-                               <&gcc GCC_CAMSS_CSI1RDI_CLK>,
-                               <&gcc GCC_CAMSS_AHB_CLK>,
-                               <&gcc GCC_CAMSS_VFE0_CLK>,
-                               <&gcc GCC_CAMSS_CSI_VFE0_CLK>,
-                               <&gcc GCC_CAMSS_VFE_AHB_CLK>,
-                               <&gcc GCC_CAMSS_VFE_AXI_CLK>;
-                       clock-names = "top_ahb",
-                               "ispif_ahb",
-                               "csiphy0_timer",
-                               "csiphy1_timer",
-                               "csi0_ahb",
-                               "csi0",
-                               "csi0_phy",
-                               "csi0_pix",
-                               "csi0_rdi",
-                               "csi1_ahb",
-                               "csi1",
-                               "csi1_phy",
-                               "csi1_pix",
-                               "csi1_rdi",
-                               "ahb",
-                               "vfe0",
-                               "csi_vfe0",
-                               "vfe_ahb",
-                               "vfe_axi";
-                       vdda-supply = <&pm8916_l2>;
-                       iommus = <&apps_iommu 3>;
-                       status = "disabled";
-                       ports {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                       };
-               };
+               pronto: remoteproc@a21b000 {
+                       compatible = "qcom,pronto-v2-pil", "qcom,pronto";
+                       reg = <0x0a204000 0x2000>, <0x0a202000 0x1000>, <0x0a21b000 0x3000>;
+                       reg-names = "ccu", "dxe", "pmu";
+
+                       memory-region = <&wcnss_mem>;
+
+                       interrupts-extended = <&intc GIC_SPI 149 IRQ_TYPE_EDGE_RISING>,
+                                             <&wcnss_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
+                                             <&wcnss_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
+                                             <&wcnss_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
+                                             <&wcnss_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;
+                       interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack";
+
+                       qcom,state = <&wcnss_smp2p_out 0>;
+                       qcom,state-names = "stop";
 
-               cci: cci@1b0c000 {
-                       compatible = "qcom,msm8916-cci";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0x1b0c000 0x1000>;
-                       interrupts = <GIC_SPI 50 IRQ_TYPE_EDGE_RISING>;
-                       clocks = <&gcc GCC_CAMSS_TOP_AHB_CLK>,
-                               <&gcc GCC_CAMSS_CCI_AHB_CLK>,
-                               <&gcc GCC_CAMSS_CCI_CLK>,
-                               <&gcc GCC_CAMSS_AHB_CLK>;
-                       clock-names = "camss_top_ahb", "cci_ahb",
-                                         "cci", "camss_ahb";
-                       assigned-clocks = <&gcc GCC_CAMSS_CCI_AHB_CLK>,
-                                         <&gcc GCC_CAMSS_CCI_CLK>;
-                       assigned-clock-rates = <80000000>, <19200000>;
                        pinctrl-names = "default";
-                       pinctrl-0 = <&cci0_default>;
+                       pinctrl-0 = <&wcnss_pin_a>;
+
                        status = "disabled";
 
-                       cci_i2c0: i2c-bus@0 {
-                               reg = <0>;
-                               clock-frequency = <400000>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
+                       iris {
+                               compatible = "qcom,wcn3620";
+
+                               clocks = <&rpmcc RPM_SMD_RF_CLK2>;
+                               clock-names = "xo";
                        };
-               };
-       };
 
-       smd {
-               compatible = "qcom,smd";
+                       smd-edge {
+                               interrupts = <GIC_SPI 142 IRQ_TYPE_EDGE_RISING>;
 
-               rpm {
-                       interrupts = <GIC_SPI 168 IRQ_TYPE_EDGE_RISING>;
-                       qcom,ipc = <&apcs 8 0>;
-                       qcom,smd-edge = <15>;
+                               qcom,ipc = <&apcs 8 17>;
+                               qcom,smd-edge = <6>;
+                               qcom,remote-pid = <4>;
 
-                       rpm-requests {
-                               compatible = "qcom,rpm-msm8916";
-                               qcom,smd-channels = "rpm_requests";
+                               label = "pronto";
 
-                               rpmcc: qcom,rpmcc {
-                                       compatible = "qcom,rpmcc-msm8916";
-                                       #clock-cells = <1>;
-                               };
+                               wcnss {
+                                       compatible = "qcom,wcnss";
+                                       qcom,smd-channels = "WCNSS_CTRL";
+
+                                       qcom,mmio = <&pronto>;
+
+                                       bt {
+                                               compatible = "qcom,wcnss-bt";
+                                       };
+
+                                       wifi {
+                                               compatible = "qcom,wcnss-wlan";
+
+                                               interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>,
+                                                            <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>;
+                                               interrupt-names = "tx", "rx";
 
-                               smd_rpm_regulators: pm8916-regulators {
-                                       compatible = "qcom,rpm-pm8916-regulators";
-
-                                       pm8916_s1: s1 {};
-                                       pm8916_s3: s3 {};
-                                       pm8916_s4: s4 {};
-
-                                       pm8916_l1: l1 {};
-                                       pm8916_l2: l2 {};
-                                       pm8916_l3: l3 {};
-                                       pm8916_l4: l4 {};
-                                       pm8916_l5: l5 {};
-                                       pm8916_l6: l6 {};
-                                       pm8916_l7: l7 {};
-                                       pm8916_l8: l8 {};
-                                       pm8916_l9: l9 {};
-                                       pm8916_l10: l10 {};
-                                       pm8916_l11: l11 {};
-                                       pm8916_l12: l12 {};
-                                       pm8916_l13: l13 {};
-                                       pm8916_l14: l14 {};
-                                       pm8916_l15: l15 {};
-                                       pm8916_l16: l16 {};
-                                       pm8916_l17: l17 {};
-                                       pm8916_l18: l18 {};
+                                               qcom,smem-states = <&apps_smsm 10>, <&apps_smsm 9>;
+                                               qcom,smem-state-names = "tx-enable", "tx-rings-empty";
+                                       };
                                };
                        };
                };
-       };
 
-       hexagon-smp2p {
-               compatible = "qcom,smp2p";
-               qcom,smem = <435>, <428>;
+               intc: interrupt-controller@b000000 {
+                       compatible = "qcom,msm-qgic2";
+                       interrupt-controller;
+                       #interrupt-cells = <3>;
+                       reg = <0x0b000000 0x1000>, <0x0b002000 0x1000>;
+               };
+
+               apcs: mailbox@b011000 {
+                       compatible = "qcom,msm8916-apcs-kpss-global", "syscon";
+                       reg = <0x0b011000 0x1000>;
+                       #mbox-cells = <1>;
+                       clocks = <&a53pll>, <&gcc GPLL0_VOTE>;
+                       clock-names = "pll", "aux";
+                       #clock-cells = <0>;
+               };
 
-               interrupts = <0 27 IRQ_TYPE_EDGE_RISING>;
+               a53pll: clock@b016000 {
+                       compatible = "qcom,msm8916-a53pll";
+                       reg = <0x0b016000 0x40>;
+                       #clock-cells = <0>;
+               };
 
-               qcom,ipc = <&apcs 8 14>;
+               timer@b020000 {
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges;
+                       compatible = "arm,armv7-timer-mem";
+                       reg = <0x0b020000 0x1000>;
+                       clock-frequency = <19200000>;
 
-               qcom,local-pid = <0>;
-               qcom,remote-pid = <1>;
+                       frame@b021000 {
+                               frame-number = <0>;
+                               interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+                               reg = <0x0b021000 0x1000>,
+                                     <0x0b022000 0x1000>;
+                       };
 
-               hexagon_smp2p_out: master-kernel {
-                       qcom,entry-name = "master-kernel";
+                       frame@b023000 {
+                               frame-number = <1>;
+                               interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
+                               reg = <0x0b023000 0x1000>;
+                               status = "disabled";
+                       };
 
-                       #qcom,smem-state-cells = <1>;
-               };
+                       frame@b024000 {
+                               frame-number = <2>;
+                               interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
+                               reg = <0x0b024000 0x1000>;
+                               status = "disabled";
+                       };
 
-               hexagon_smp2p_in: slave-kernel {
-                       qcom,entry-name = "slave-kernel";
+                       frame@b025000 {
+                               frame-number = <3>;
+                               interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
+                               reg = <0x0b025000 0x1000>;
+                               status = "disabled";
+                       };
 
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
+                       frame@b026000 {
+                               frame-number = <4>;
+                               interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
+                               reg = <0x0b026000 0x1000>;
+                               status = "disabled";
+                       };
+
+                       frame@b027000 {
+                               frame-number = <5>;
+                               interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
+                               reg = <0x0b027000 0x1000>;
+                               status = "disabled";
+                       };
+
+                       frame@b028000 {
+                               frame-number = <6>;
+                               interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
+                               reg = <0x0b028000 0x1000>;
+                               status = "disabled";
+                       };
                };
        };
 
-       wcnss-smp2p {
-               compatible = "qcom,smp2p";
-               qcom,smem = <451>, <431>;
+       thermal-zones {
+               cpu0-1-thermal {
+                       polling-delay-passive = <250>;
+                       polling-delay = <1000>;
 
-               interrupts = <0 143 IRQ_TYPE_EDGE_RISING>;
+                       thermal-sensors = <&tsens 5>;
 
-               qcom,ipc = <&apcs 8 18>;
+                       trips {
+                               cpu0_1_alert0: trip-point0 {
+                                       temperature = <75000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+                               cpu0_1_crit: cpu_crit {
+                                       temperature = <110000>;
+                                       hysteresis = <2000>;
+                                       type = "critical";
+                               };
+                       };
 
-               qcom,local-pid = <0>;
-               qcom,remote-pid = <4>;
+                       cooling-maps {
+                               map0 {
+                                       trip = <&cpu0_1_alert0>;
+                                       cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+                                                        <&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+                                                        <&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+                                                        <&CPU3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+                               };
+                       };
+               };
 
-               wcnss_smp2p_out: master-kernel {
-                       qcom,entry-name = "master-kernel";
+               cpu2-3-thermal {
+                       polling-delay-passive = <250>;
+                       polling-delay = <1000>;
 
-                       #qcom,smem-state-cells = <1>;
-               };
+                       thermal-sensors = <&tsens 4>;
 
-               wcnss_smp2p_in: slave-kernel {
-                       qcom,entry-name = "slave-kernel";
+                       trips {
+                               cpu2_3_alert0: trip-point0 {
+                                       temperature = <75000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+                               cpu2_3_crit: cpu_crit {
+                                       temperature = <110000>;
+                                       hysteresis = <2000>;
+                                       type = "critical";
+                               };
+                       };
 
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
+                       cooling-maps {
+                               map0 {
+                                       trip = <&cpu2_3_alert0>;
+                                       cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+                                                        <&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+                                                        <&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+                                                        <&CPU3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+                               };
+                       };
                };
-       };
 
-       smsm {
-               compatible = "qcom,smsm";
+               gpu-thermal {
+                       polling-delay-passive = <250>;
+                       polling-delay = <1000>;
 
-               #address-cells = <1>;
-               #size-cells = <0>;
+                       thermal-sensors = <&tsens 2>;
 
-               qcom,ipc-1 = <&apcs 8 13>;
-               qcom,ipc-3 = <&apcs 8 19>;
+                       trips {
+                               gpu_alert0: trip-point0 {
+                                       temperature = <75000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+                               gpu_crit: gpu_crit {
+                                       temperature = <95000>;
+                                       hysteresis = <2000>;
+                                       type = "critical";
+                               };
+                       };
+               };
 
-               apps_smsm: apps@0 {
-                       reg = <0>;
+               camera-thermal {
+                       polling-delay-passive = <250>;
+                       polling-delay = <1000>;
 
-                       #qcom,smem-state-cells = <1>;
+                       thermal-sensors = <&tsens 1>;
+
+                       trips {
+                               cam_alert0: trip-point0 {
+                                       temperature = <75000>;
+                                       hysteresis = <2000>;
+                                       type = "hot";
+                               };
+                       };
                };
 
-               hexagon_smsm: hexagon@1 {
-                       reg = <1>;
-                       interrupts = <0 26 IRQ_TYPE_EDGE_RISING>;
+               modem-thermal {
+                       polling-delay-passive = <250>;
+                       polling-delay = <1000>;
 
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
+                       thermal-sensors = <&tsens 0>;
+
+                       trips {
+                               modem_alert0: trip-point0 {
+                                       temperature = <85000>;
+                                       hysteresis = <2000>;
+                                       type = "hot";
+                               };
+                       };
                };
 
-               wcnss_smsm: wcnss@6 {
-                       reg = <6>;
-                       interrupts = <0 144 IRQ_TYPE_EDGE_RISING>;
+       };
 
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-               };
+       timer {
+               compatible = "arm,armv8-timer";
+               interrupts = <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+                            <GIC_PPI 3 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+                            <GIC_PPI 4 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+                            <GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
        };
 };