Merge tag 'usb-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / qcom / sm8450.dtsi
index f9f7f17..7d08fad 100644 (file)
@@ -6,11 +6,13 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/clock/qcom,gcc-sm8450.h>
 #include <dt-bindings/clock/qcom,rpmh.h>
+#include <dt-bindings/dma/qcom-gpi.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/mailbox/qcom-ipcc.h>
 #include <dt-bindings/power/qcom-rpmpd.h>
 #include <dt-bindings/interconnect/qcom,sm8450.h>
 #include <dt-bindings/soc/qcom,rpmh-rsc.h>
+#include <dt-bindings/thermal/thermal.h>
 
 / {
        interrupt-parent = <&intc>;
@@ -47,6 +49,7 @@
                        power-domains = <&CPU_PD0>;
                        power-domain-names = "psci";
                        qcom,freq-domain = <&cpufreq_hw 0>;
+                       #cooling-cells = <2>;
                        L2_0: l2-cache {
                              compatible = "cache";
                              next-level-cache = <&L3_0>;
@@ -65,6 +68,7 @@
                        power-domains = <&CPU_PD1>;
                        power-domain-names = "psci";
                        qcom,freq-domain = <&cpufreq_hw 0>;
+                       #cooling-cells = <2>;
                        L2_100: l2-cache {
                              compatible = "cache";
                              next-level-cache = <&L3_0>;
@@ -80,6 +84,7 @@
                        power-domains = <&CPU_PD2>;
                        power-domain-names = "psci";
                        qcom,freq-domain = <&cpufreq_hw 0>;
+                       #cooling-cells = <2>;
                        L2_200: l2-cache {
                              compatible = "cache";
                              next-level-cache = <&L3_0>;
                        power-domains = <&CPU_PD3>;
                        power-domain-names = "psci";
                        qcom,freq-domain = <&cpufreq_hw 0>;
+                       #cooling-cells = <2>;
                        L2_300: l2-cache {
                              compatible = "cache";
                              next-level-cache = <&L3_0>;
                        power-domains = <&CPU_PD4>;
                        power-domain-names = "psci";
                        qcom,freq-domain = <&cpufreq_hw 1>;
+                       #cooling-cells = <2>;
                        L2_400: l2-cache {
                              compatible = "cache";
                              next-level-cache = <&L3_0>;
                        power-domains = <&CPU_PD5>;
                        power-domain-names = "psci";
                        qcom,freq-domain = <&cpufreq_hw 1>;
+                       #cooling-cells = <2>;
                        L2_500: l2-cache {
                              compatible = "cache";
                              next-level-cache = <&L3_0>;
                        power-domains = <&CPU_PD6>;
                        power-domain-names = "psci";
                        qcom,freq-domain = <&cpufreq_hw 1>;
+                       #cooling-cells = <2>;
                        L2_600: l2-cache {
                              compatible = "cache";
                              next-level-cache = <&L3_0>;
                        power-domains = <&CPU_PD7>;
                        power-domain-names = "psci";
                        qcom,freq-domain = <&cpufreq_hw 2>;
+                       #cooling-cells = <2>;
                        L2_700: l2-cache {
                              compatible = "cache";
                              next-level-cache = <&L3_0>;
                };
        };
 
+       qup_opp_table_100mhz: qup-100mhz-opp-table {
+               compatible = "operating-points-v2";
+
+               opp-50000000 {
+                       opp-hz = /bits/ 64 <50000000>;
+                       required-opps = <&rpmhpd_opp_min_svs>;
+               };
+
+               opp-75000000 {
+                       opp-hz = /bits/ 64 <75000000>;
+                       required-opps = <&rpmhpd_opp_low_svs>;
+               };
+
+               opp-100000000 {
+                       opp-hz = /bits/ 64 <100000000>;
+                       required-opps = <&rpmhpd_opp_svs>;
+               };
+       };
+
        reserved_memory: reserved-memory {
                #address-cells = <2>;
                #size-cells = <2>;
                        #clock-cells = <1>;
                        #reset-cells = <1>;
                        #power-domain-cells = <1>;
-                       clock-names = "bi_tcxo", "sleep_clk";
-                       clocks = <&rpmhcc RPMH_CXO_CLK>, <&sleep_clk>;
+                       clocks = <&rpmhcc RPMH_CXO_CLK>,
+                                <&pcie0_lane>,
+                                <&pcie1_lane>,
+                                <&sleep_clk>;
+                       clock-names = "bi_tcxo",
+                                     "pcie_0_pipe_clk",
+                                     "pcie_1_pipe_clk",
+                                     "sleep_clk";
+               };
+
+               gpi_dma2: dma-controller@800000 {
+                       compatible = "qcom,sm8450-gpi-dma";
+                       #dma-cells = <3>;
+                       reg = <0 0x800000 0 0x60000>;
+                       interrupts = <GIC_SPI 588 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 589 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 590 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 591 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 592 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 593 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 594 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 595 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 596 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 597 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 598 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 599 IRQ_TYPE_LEVEL_HIGH>;
+                       dma-channels = <12>;
+                       dma-channel-mask = <0x7e>;
+                       iommus = <&apps_smmu 0x496 0x0>;
+                       status = "disabled";
                };
 
-               qupv3_id_0: geniqup@9c0000 {
+               qupv3_id_2: geniqup@8c0000 {
                        compatible = "qcom,geni-se-qup";
-                       reg = <0x0 0x009c0000 0x0 0x2000>;
+                       reg = <0x0 0x008c0000 0x0 0x2000>;
                        clock-names = "m-ahb", "s-ahb";
-                       clocks = <&gcc GCC_QUPV3_WRAP_0_M_AHB_CLK>,
-                                <&gcc GCC_QUPV3_WRAP_0_S_AHB_CLK>;
+                       clocks = <&gcc GCC_QUPV3_WRAP_2_M_AHB_CLK>,
+                                <&gcc GCC_QUPV3_WRAP_2_S_AHB_CLK>;
+                       iommus = <&apps_smmu 0x483 0x0>;
                        #address-cells = <2>;
                        #size-cells = <2>;
                        ranges;
                        status = "disabled";
 
-                       uart7: serial@99c000 {
-                               compatible = "qcom,geni-debug-uart";
-                               reg = <0 0x0099c000 0 0x4000>;
+                       i2c15: i2c@880000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x00880000 0x0 0x4000>;
                                clock-names = "se";
-                               clocks = <&gcc GCC_QUPV3_WRAP0_S7_CLK>;
+                               clocks = <&gcc GCC_QUPV3_WRAP2_S0_CLK>;
                                pinctrl-names = "default";
-                               pinctrl-0 = <&qup_uart7_tx>, <&qup_uart7_rx>;
-                               interrupts = <GIC_SPI 608 IRQ_TYPE_LEVEL_HIGH>;
+                               pinctrl-0 = <&qup_i2c15_data_clk>;
+                               interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
                                #address-cells = <1>;
                                #size-cells = <0>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_2 0 &clk_virt SLAVE_QUP_CORE_2 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_2 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma2 0 0 QCOM_GPI_I2C>,
+                                      <&gpi_dma2 1 0 QCOM_GPI_I2C>;
+                               dma-names = "tx", "rx";
                                status = "disabled";
                        };
-               };
 
-               qupv3_id_1: geniqup@ac0000 {
-                       compatible = "qcom,geni-se-qup";
-                       reg = <0x0 0x00ac0000 0x0 0x6000>;
-                       clock-names = "m-ahb", "s-ahb";
-                       clocks = <&gcc GCC_QUPV3_WRAP_1_M_AHB_CLK>,
-                                <&gcc GCC_QUPV3_WRAP_1_S_AHB_CLK>;
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges;
-                       status = "disabled";
+                       spi15: spi@880000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x00880000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP2_S0_CLK>;
+                               interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi15_data_clk>, <&qup_spi15_cs>;
+                               spi-max-frequency = <50000000>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_2 0 &clk_virt SLAVE_QUP_CORE_2 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               dmas = <&gpi_dma2 0 0 QCOM_GPI_SPI>,
+                                      <&gpi_dma2 1 0 QCOM_GPI_SPI>;
+                               dma-names = "tx", "rx";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
 
-                       i2c13: i2c@a94000 {
+                       i2c16: i2c@884000 {
                                compatible = "qcom,geni-i2c";
-                               reg = <0 0x00a94000 0 0x4000>;
+                               reg = <0x0 0x00884000 0x0 0x4000>;
                                clock-names = "se";
-                               clocks = <&gcc GCC_QUPV3_WRAP1_S5_CLK>;
+                               clocks = <&gcc GCC_QUPV3_WRAP2_S1_CLK>;
                                pinctrl-names = "default";
-                               pinctrl-0 = <&qup_i2c13_data_clk>;
-                               interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
+                               pinctrl-0 = <&qup_i2c16_data_clk>;
+                               interrupts = <GIC_SPI 583 IRQ_TYPE_LEVEL_HIGH>;
                                #address-cells = <1>;
                                #size-cells = <0>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_2 0 &clk_virt SLAVE_QUP_CORE_2 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_2 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma2 0 1 QCOM_GPI_I2C>,
+                                      <&gpi_dma2 1 1 QCOM_GPI_I2C>;
+                               dma-names = "tx", "rx";
                                status = "disabled";
                        };
 
-                       i2c14: i2c@a98000 {
-                               compatible = "qcom,geni-i2c";
-                               reg = <0 0x00a98000 0 0x4000>;
+                       spi16: spi@884000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x00884000 0x0 0x4000>;
                                clock-names = "se";
-                               clocks = <&gcc GCC_QUPV3_WRAP1_S6_CLK>;
+                               clocks = <&gcc GCC_QUPV3_WRAP2_S1_CLK>;
+                               interrupts = <GIC_SPI 583 IRQ_TYPE_LEVEL_HIGH>;
                                pinctrl-names = "default";
-                               pinctrl-0 = <&qup_i2c14_data_clk>;
-                               interrupts = <GIC_SPI 363 IRQ_TYPE_LEVEL_HIGH>;
+                               pinctrl-0 = <&qup_spi16_data_clk>, <&qup_spi16_cs>;
+                               spi-max-frequency = <50000000>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_2 0 &clk_virt SLAVE_QUP_CORE_2 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               dmas = <&gpi_dma2 0 1 QCOM_GPI_SPI>,
+                                      <&gpi_dma2 1 1 QCOM_GPI_SPI>;
+                               dma-names = "tx", "rx";
                                #address-cells = <1>;
                                #size-cells = <0>;
                                status = "disabled";
                        };
-               };
 
-               config_noc: interconnect@1500000 {
-                       compatible = "qcom,sm8450-config-noc";
-                       reg = <0 0x01500000 0 0x1c000>;
-                       #interconnect-cells = <2>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
-               };
+                       i2c17: i2c@888000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x00888000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP2_S2_CLK>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_i2c17_data_clk>;
+                               interrupts = <GIC_SPI 584 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_2 0 &clk_virt SLAVE_QUP_CORE_2 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_2 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma2 0 2 QCOM_GPI_I2C>,
+                                      <&gpi_dma2 1 2 QCOM_GPI_I2C>;
+                               dma-names = "tx", "rx";
+                               status = "disabled";
+                       };
 
-               system_noc: interconnect@1680000 {
-                       compatible = "qcom,sm8450-system-noc";
-                       reg = <0 0x01680000 0 0x1e200>;
-                       #interconnect-cells = <2>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
-               };
+                       spi17: spi@888000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x00888000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP2_S2_CLK>;
+                               interrupts = <GIC_SPI 584 IRQ_TYPE_LEVEL_HIGH>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi17_data_clk>, <&qup_spi17_cs>;
+                               spi-max-frequency = <50000000>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_2 0 &clk_virt SLAVE_QUP_CORE_2 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               dmas = <&gpi_dma2 0 2 QCOM_GPI_SPI>,
+                                      <&gpi_dma2 1 2 QCOM_GPI_SPI>;
+                               dma-names = "tx", "rx";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
 
-               pcie_noc: interconnect@16c0000 {
-                       compatible = "qcom,sm8450-pcie-anoc";
-                       reg = <0 0x016c0000 0 0xe280>;
-                       #interconnect-cells = <2>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
-               };
+                       i2c18: i2c@88c000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x0088c000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP2_S3_CLK>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_i2c18_data_clk>;
+                               interrupts = <GIC_SPI 585 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_2 0 &clk_virt SLAVE_QUP_CORE_2 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_2 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma2 0 3 QCOM_GPI_I2C>,
+                                      <&gpi_dma2 1 3 QCOM_GPI_I2C>;
+                               dma-names = "tx", "rx";
+                               status = "disabled";
+                       };
 
-               aggre1_noc: interconnect@16e0000 {
-                       compatible = "qcom,sm8450-aggre1-noc";
-                       reg = <0 0x016e0000 0 0x1c080>;
-                       #interconnect-cells = <2>;
-                       clocks = <&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>,
-                                <&gcc GCC_AGGRE_USB3_PRIM_AXI_CLK>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
-               };
+                       spi18: spi@88c000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0 0x0088c000 0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP2_S3_CLK>;
+                               interrupts = <GIC_SPI 585 IRQ_TYPE_LEVEL_HIGH>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi18_data_clk>, <&qup_spi18_cs>;
+                               spi-max-frequency = <50000000>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_2 0 &clk_virt SLAVE_QUP_CORE_2 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               dmas = <&gpi_dma2 0 3 QCOM_GPI_I2C>,
+                                      <&gpi_dma2 1 3 QCOM_GPI_I2C>;
+                               dma-names = "tx", "rx";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
 
-               aggre2_noc: interconnect@1700000 {
-                       compatible = "qcom,sm8450-aggre2-noc";
-                       reg = <0 0x01700000 0 0x31080>;
-                       #interconnect-cells = <2>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
-                       clocks = <&gcc GCC_AGGRE_NOC_PCIE_0_AXI_CLK>,
-                                <&gcc GCC_AGGRE_NOC_PCIE_1_AXI_CLK>,
-                                <&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>,
-                                <&rpmhcc RPMH_IPA_CLK>;
-               };
+                       i2c19: i2c@890000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x00890000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP2_S4_CLK>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_i2c19_data_clk>;
+                               interrupts = <GIC_SPI 586 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_2 0 &clk_virt SLAVE_QUP_CORE_2 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_2 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma2 0 4 QCOM_GPI_I2C>,
+                                      <&gpi_dma2 1 4 QCOM_GPI_I2C>;
+                               dma-names = "tx", "rx";
+                               status = "disabled";
+                       };
 
-               mmss_noc: interconnect@1740000 {
-                       compatible = "qcom,sm8450-mmss-noc";
-                       reg = <0 0x01740000 0 0x1f080>;
-                       #interconnect-cells = <2>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
-               };
+                       spi19: spi@890000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0 0x00890000 0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP2_S4_CLK>;
+                               interrupts = <GIC_SPI 586 IRQ_TYPE_LEVEL_HIGH>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi19_data_clk>, <&qup_spi19_cs>;
+                               spi-max-frequency = <50000000>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_2 0 &clk_virt SLAVE_QUP_CORE_2 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               dmas = <&gpi_dma2 0 4 QCOM_GPI_I2C>,
+                                      <&gpi_dma2 1 4 QCOM_GPI_I2C>;
+                               dma-names = "tx", "rx";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
 
-               tcsr_mutex: hwlock@1f40000 {
-                       compatible = "qcom,tcsr-mutex";
-                       reg = <0x0 0x01f40000 0x0 0x40000>;
-                       #hwlock-cells = <1>;
-               };
+                       i2c20: i2c@894000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x00894000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP2_S5_CLK>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_i2c20_data_clk>;
+                               interrupts = <GIC_SPI 587 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_2 0 &clk_virt SLAVE_QUP_CORE_2 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_2 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma2 0 5 QCOM_GPI_I2C>,
+                                      <&gpi_dma2 1 5 QCOM_GPI_I2C>;
+                               dma-names = "tx", "rx";
+                               status = "disabled";
+                       };
 
-               usb_1_hsphy: phy@88e3000 {
-                       compatible = "qcom,sm8450-usb-hs-phy",
-                                    "qcom,usb-snps-hs-7nm-phy";
-                       reg = <0 0x088e3000 0 0x400>;
-                       status = "disabled";
-                       #phy-cells = <0>;
+                       spi20: spi@894000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0 0x00894000 0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP2_S5_CLK>;
+                               interrupts = <GIC_SPI 587 IRQ_TYPE_LEVEL_HIGH>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi20_data_clk>, <&qup_spi20_cs>;
+                               spi-max-frequency = <50000000>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_2 0 &clk_virt SLAVE_QUP_CORE_2 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               dmas = <&gpi_dma2 0 5 QCOM_GPI_SPI>,
+                                      <&gpi_dma2 1 5 QCOM_GPI_SPI>;
+                               dma-names = "tx", "rx";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
 
-                       clocks = <&rpmhcc RPMH_CXO_CLK>;
-                       clock-names = "ref";
+                       i2c21: i2c@898000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x00898000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP2_S6_CLK>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_i2c21_data_clk>;
+                               interrupts = <GIC_SPI 579 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_2 0 &clk_virt SLAVE_QUP_CORE_2 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_2 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma2 0 6 QCOM_GPI_I2C>,
+                                      <&gpi_dma2 1 6 QCOM_GPI_I2C>;
+                               dma-names = "tx", "rx";
+                               status = "disabled";
+                       };
 
-                       resets = <&gcc GCC_QUSB2PHY_PRIM_BCR>;
+                       spi21: spi@898000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0 0x00898000 0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP2_S6_CLK>;
+                               interrupts = <GIC_SPI 579 IRQ_TYPE_LEVEL_HIGH>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi21_data_clk>, <&qup_spi21_cs>;
+                               spi-max-frequency = <50000000>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_2 0 &clk_virt SLAVE_QUP_CORE_2 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               dmas = <&gpi_dma2 0 6 QCOM_GPI_SPI>,
+                                      <&gpi_dma2 1 6 QCOM_GPI_SPI>;
+                               dma-names = "tx", "rx";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
                };
 
-               usb_1_qmpphy: phy-wrapper@88e9000 {
-                       compatible = "qcom,sm8450-qmp-usb3-phy";
-                       reg = <0 0x088e9000 0 0x200>,
-                             <0 0x088e8000 0 0x20>;
+               gpi_dma0: dma-controller@900000 {
+                       compatible = "qcom,sm8450-gpi-dma";
+                       #dma-cells = <3>;
+                       reg = <0 0x900000 0 0x60000>;
+                       interrupts = <GIC_SPI 244 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 245 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 248 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 249 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 250 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 251 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 252 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 253 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 254 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 255 IRQ_TYPE_LEVEL_HIGH>;
+                       dma-channels = <12>;
+                       dma-channel-mask = <0x7e>;
+                       iommus = <&apps_smmu 0x5b6 0x0>;
                        status = "disabled";
+               };
+
+               qupv3_id_0: geniqup@9c0000 {
+                       compatible = "qcom,geni-se-qup";
+                       reg = <0x0 0x009c0000 0x0 0x2000>;
+                       clock-names = "m-ahb", "s-ahb";
+                       clocks = <&gcc GCC_QUPV3_WRAP_0_M_AHB_CLK>,
+                                <&gcc GCC_QUPV3_WRAP_0_S_AHB_CLK>;
+                       iommus = <&apps_smmu 0x5a3 0x0>;
+                       interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>;
+                       interconnect-names = "qup-core";
                        #address-cells = <2>;
                        #size-cells = <2>;
                        ranges;
+                       status = "disabled";
 
-                       clocks = <&gcc GCC_USB3_PRIM_PHY_AUX_CLK>,
-                                <&rpmhcc RPMH_CXO_CLK>,
-                                <&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>;
-                       clock-names = "aux", "ref_clk_src", "com_aux";
+                       i2c0: i2c@980000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x00980000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S0_CLK>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_i2c0_data_clk>;
+                               interrupts = <GIC_SPI 601 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma0 0 0 QCOM_GPI_I2C>,
+                                      <&gpi_dma0 1 0 QCOM_GPI_I2C>;
+                               dma-names = "tx", "rx";
+                               status = "disabled";
+                       };
 
-                       resets = <&gcc GCC_USB3_DP_PHY_PRIM_BCR>,
-                                <&gcc GCC_USB3_PHY_PRIM_BCR>;
-                       reset-names = "phy", "common";
+                       spi0: spi@980000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x00980000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S0_CLK>;
+                               interrupts = <GIC_SPI 601 IRQ_TYPE_LEVEL_HIGH>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi0_data_clk>, <&qup_spi0_cs>;
+                               power-domains = <&rpmhpd SM8450_CX>;
+                               operating-points-v2 = <&qup_opp_table_100mhz>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma0 0 0 QCOM_GPI_SPI>,
+                                      <&gpi_dma0 1 0 QCOM_GPI_SPI>;
+                               dma-names = "tx", "rx";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
 
-                       usb_1_ssphy: phy@88e9200 {
-                               reg = <0 0x088e9200 0 0x200>,
-                                     <0 0x088e9400 0 0x200>,
-                                     <0 0x088e9c00 0 0x400>,
-                                     <0 0x088e9600 0 0x200>,
-                                     <0 0x088e9800 0 0x200>,
-                                     <0 0x088e9a00 0 0x100>;
-                               #phy-cells = <0>;
-                               #clock-cells = <1>;
-                               clocks = <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>;
-                               clock-names = "pipe0";
-                               clock-output-names = "usb3_phy_pipe_clk_src";
+                       i2c1: i2c@984000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x00984000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S1_CLK>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_i2c1_data_clk>;
+                               interrupts = <GIC_SPI 602 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma0 0 1 QCOM_GPI_I2C>,
+                                      <&gpi_dma0 1 1 QCOM_GPI_I2C>;
+                               dma-names = "tx", "rx";
+                               status = "disabled";
                        };
-               };
 
-               remoteproc_slpi: remoteproc@2400000 {
-                       compatible = "qcom,sm8450-slpi-pas";
-                       reg = <0 0x02400000 0 0x4000>;
+                       spi1: spi@984000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x00984000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S1_CLK>;
+                               interrupts = <GIC_SPI 602 IRQ_TYPE_LEVEL_HIGH>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi1_data_clk>, <&qup_spi1_cs>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma0 0 1 QCOM_GPI_SPI>,
+                                      <&gpi_dma0 1 1 QCOM_GPI_SPI>;
+                               dma-names = "tx", "rx";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
 
-                       interrupts-extended = <&pdc 9 IRQ_TYPE_LEVEL_HIGH>,
-                                             <&smp2p_slpi_in 0 IRQ_TYPE_EDGE_RISING>,
-                                             <&smp2p_slpi_in 1 IRQ_TYPE_EDGE_RISING>,
-                                             <&smp2p_slpi_in 2 IRQ_TYPE_EDGE_RISING>,
-                                             <&smp2p_slpi_in 3 IRQ_TYPE_EDGE_RISING>;
-                       interrupt-names = "wdog", "fatal", "ready",
-                                         "handover", "stop-ack";
+                       i2c2: i2c@988000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x00988000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S2_CLK>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_i2c2_data_clk>;
+                               interrupts = <GIC_SPI 603 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma0 0 2 QCOM_GPI_I2C>,
+                                      <&gpi_dma0 1 2 QCOM_GPI_I2C>;
+                               dma-names = "tx", "rx";
+                               status = "disabled";
+                       };
 
-                       clocks = <&rpmhcc RPMH_CXO_CLK>;
-                       clock-names = "xo";
+                       spi2: spi@988000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x00988000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S2_CLK>;
+                               interrupts = <GIC_SPI 603 IRQ_TYPE_LEVEL_HIGH>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi2_data_clk>, <&qup_spi2_cs>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma0 0 2 QCOM_GPI_SPI>,
+                                      <&gpi_dma0 1 2 QCOM_GPI_SPI>;
+                               dma-names = "tx", "rx";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
 
-                       power-domains = <&rpmhpd SM8450_LCX>,
-                                       <&rpmhpd SM8450_LMX>;
-                       power-domain-names = "lcx", "lmx";
 
-                       memory-region = <&slpi_mem>;
+                       i2c3: i2c@98c000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x0098c000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S3_CLK>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_i2c3_data_clk>;
+                               interrupts = <GIC_SPI 604 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma0 0 3 QCOM_GPI_I2C>,
+                                      <&gpi_dma0 1 3 QCOM_GPI_I2C>;
+                               dma-names = "tx", "rx";
+                               status = "disabled";
+                       };
 
-                       qcom,qmp = <&aoss_qmp>;
+                       spi3: spi@98c000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x0098c000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S3_CLK>;
+                               interrupts = <GIC_SPI 604 IRQ_TYPE_LEVEL_HIGH>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi3_data_clk>, <&qup_spi3_cs>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma0 0 3 QCOM_GPI_SPI>,
+                                      <&gpi_dma0 1 3 QCOM_GPI_SPI>;
+                               dma-names = "tx", "rx";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
 
-                       qcom,smem-states = <&smp2p_slpi_out 0>;
-                       qcom,smem-state-names = "stop";
+                       i2c4: i2c@990000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x00990000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S4_CLK>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_i2c4_data_clk>;
+                               interrupts = <GIC_SPI 605 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma0 0 4 QCOM_GPI_I2C>,
+                                      <&gpi_dma0 1 4 QCOM_GPI_I2C>;
+                               dma-names = "tx", "rx";
+                               status = "disabled";
+                       };
 
-                       status = "disabled";
+                       spi4: spi@990000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x00990000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S4_CLK>;
+                               interrupts = <GIC_SPI 605 IRQ_TYPE_LEVEL_HIGH>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi4_data_clk>, <&qup_spi4_cs>;
+                               power-domains = <&rpmhpd SM8450_CX>;
+                               operating-points-v2 = <&qup_opp_table_100mhz>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma0 0 4 QCOM_GPI_SPI>,
+                                      <&gpi_dma0 1 4 QCOM_GPI_SPI>;
+                               dma-names = "tx", "rx";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
 
-                       glink-edge {
-                               interrupts-extended = <&ipcc IPCC_CLIENT_SLPI
-                                                            IPCC_MPROC_SIGNAL_GLINK_QMP
-                                                            IRQ_TYPE_EDGE_RISING>;
-                               mboxes = <&ipcc IPCC_CLIENT_SLPI
-                                               IPCC_MPROC_SIGNAL_GLINK_QMP>;
+                       i2c5: i2c@994000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x00994000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S5_CLK>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_i2c5_data_clk>;
+                               interrupts = <GIC_SPI 606 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma0 0 5 QCOM_GPI_I2C>,
+                                      <&gpi_dma0 1 5 QCOM_GPI_I2C>;
+                               dma-names = "tx", "rx";
+                               status = "disabled";
+                       };
 
-                               label = "slpi";
-                               qcom,remote-pid = <3>;
+                       spi5: spi@994000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x00994000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S5_CLK>;
+                               interrupts = <GIC_SPI 606 IRQ_TYPE_LEVEL_HIGH>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi5_data_clk>, <&qup_spi5_cs>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma0 0 5 QCOM_GPI_SPI>,
+                                      <&gpi_dma0 1 5 QCOM_GPI_SPI>;
+                               dma-names = "tx", "rx";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
                        };
-               };
 
-               remoteproc_adsp: remoteproc@30000000 {
-                       compatible = "qcom,sm8450-adsp-pas";
-                       reg = <0 0x030000000 0 0x100>;
 
-                       interrupts-extended = <&pdc 6 IRQ_TYPE_LEVEL_HIGH>,
-                                             <&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>,
-                                             <&smp2p_adsp_in 1 IRQ_TYPE_EDGE_RISING>,
-                                             <&smp2p_adsp_in 2 IRQ_TYPE_EDGE_RISING>,
-                                             <&smp2p_adsp_in 3 IRQ_TYPE_EDGE_RISING>;
-                       interrupt-names = "wdog", "fatal", "ready",
-                                         "handover", "stop-ack";
+                       i2c6: i2c@998000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x998000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S6_CLK>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_i2c6_data_clk>;
+                               interrupts = <GIC_SPI 607 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma0 0 6 QCOM_GPI_I2C>,
+                                      <&gpi_dma0 1 6 QCOM_GPI_I2C>;
+                               dma-names = "tx", "rx";
+                               status = "disabled";
+                       };
 
-                       clocks = <&rpmhcc RPMH_CXO_CLK>;
-                       clock-names = "xo";
+                       spi6: spi@998000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x998000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S6_CLK>;
+                               interrupts = <GIC_SPI 607 IRQ_TYPE_LEVEL_HIGH>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi6_data_clk>, <&qup_spi6_cs>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma0 0 6 QCOM_GPI_SPI>,
+                                      <&gpi_dma0 1 6 QCOM_GPI_SPI>;
+                               dma-names = "tx", "rx";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
 
-                       power-domains = <&rpmhpd SM8450_LCX>,
-                                       <&rpmhpd SM8450_LMX>;
-                       power-domain-names = "lcx", "lmx";
+                       uart7: serial@99c000 {
+                               compatible = "qcom,geni-debug-uart";
+                               reg = <0 0x0099c000 0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S7_CLK>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_uart7_tx>, <&qup_uart7_rx>;
+                               interrupts = <GIC_SPI 608 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
+               };
 
-                       memory-region = <&adsp_mem>;
+               gpi_dma1: dma-controller@a00000 {
+                       compatible = "qcom,sm8450-gpi-dma";
+                       #dma-cells = <3>;
+                       reg = <0 0xa00000 0 0x60000>;
+                       interrupts = <GIC_SPI 279 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 280 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 281 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 282 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 283 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 284 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 293 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 294 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 295 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 296 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 297 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 298 IRQ_TYPE_LEVEL_HIGH>;
+                       dma-channels = <12>;
+                       dma-channel-mask = <0x7e>;
+                       iommus = <&apps_smmu 0x56 0x0>;
+                       status = "disabled";
+               };
 
-                       qcom,qmp = <&aoss_qmp>;
+               qupv3_id_1: geniqup@ac0000 {
+                       compatible = "qcom,geni-se-qup";
+                       reg = <0x0 0x00ac0000 0x0 0x6000>;
+                       clock-names = "m-ahb", "s-ahb";
+                       clocks = <&gcc GCC_QUPV3_WRAP_1_M_AHB_CLK>,
+                                <&gcc GCC_QUPV3_WRAP_1_S_AHB_CLK>;
+                       iommus = <&apps_smmu 0x43 0x0>;
+                       interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>;
+                       interconnect-names = "qup-core";
+                       #address-cells = <2>;
+                       #size-cells = <2>;
+                       ranges;
+                       status = "disabled";
 
-                       qcom,smem-states = <&smp2p_adsp_out 0>;
-                       qcom,smem-state-names = "stop";
+                       i2c8: i2c@a80000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x00a80000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S0_CLK>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_i2c8_data_clk>;
+                               interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma1 0 0 QCOM_GPI_I2C>,
+                                      <&gpi_dma1 1 0 QCOM_GPI_I2C>;
+                               dma-names = "tx", "rx";
+                               status = "disabled";
+                       };
 
-                       status = "disabled";
+                       spi8: spi@a80000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x00a80000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S0_CLK>;
+                               interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi8_data_clk>, <&qup_spi8_cs>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma1 0 0 QCOM_GPI_SPI>,
+                                      <&gpi_dma1 1 0 QCOM_GPI_SPI>;
+                               dma-names = "tx", "rx";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
 
-                       remoteproc_adsp_glink: glink-edge {
-                               interrupts-extended = <&ipcc IPCC_CLIENT_LPASS
-                                                            IPCC_MPROC_SIGNAL_GLINK_QMP
-                                                            IRQ_TYPE_EDGE_RISING>;
-                               mboxes = <&ipcc IPCC_CLIENT_LPASS
-                                               IPCC_MPROC_SIGNAL_GLINK_QMP>;
+                       i2c9: i2c@a84000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x00a84000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S1_CLK>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_i2c9_data_clk>;
+                               interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma1 0 1 QCOM_GPI_I2C>,
+                                      <&gpi_dma1 1 1 QCOM_GPI_I2C>;
+                               dma-names = "tx", "rx";
+                               status = "disabled";
+                       };
 
-                               label = "lpass";
-                               qcom,remote-pid = <2>;
+                       spi9: spi@a84000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x00a84000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S1_CLK>;
+                               interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi9_data_clk>, <&qup_spi9_cs>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma1 0 1 QCOM_GPI_SPI>,
+                                      <&gpi_dma1 1 1 QCOM_GPI_SPI>;
+                               dma-names = "tx", "rx";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
                        };
-               };
 
-               remoteproc_cdsp: remoteproc@32300000 {
-                       compatible = "qcom,sm8450-cdsp-pas";
-                       reg = <0 0x032300000 0 0x1400000>;
+                       i2c10: i2c@a88000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x00a88000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S2_CLK>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_i2c10_data_clk>;
+                               interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma1 0 2 QCOM_GPI_I2C>,
+                                      <&gpi_dma1 1 2 QCOM_GPI_I2C>;
+                               dma-names = "tx", "rx";
+                               status = "disabled";
+                       };
 
-                       interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_LEVEL_HIGH>,
-                                             <&smp2p_cdsp_in 0 IRQ_TYPE_EDGE_RISING>,
-                                             <&smp2p_cdsp_in 1 IRQ_TYPE_EDGE_RISING>,
-                                             <&smp2p_cdsp_in 2 IRQ_TYPE_EDGE_RISING>,
-                                             <&smp2p_cdsp_in 3 IRQ_TYPE_EDGE_RISING>;
-                       interrupt-names = "wdog", "fatal", "ready",
-                                         "handover", "stop-ack";
+                       spi10: spi@a88000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x00a88000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S2_CLK>;
+                               interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi10_data_clk>, <&qup_spi10_cs>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma1 0 2 QCOM_GPI_SPI>,
+                                      <&gpi_dma1 1 2 QCOM_GPI_SPI>;
+                               dma-names = "tx", "rx";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
 
-                       clocks = <&rpmhcc RPMH_CXO_CLK>;
-                       clock-names = "xo";
+                       i2c11: i2c@a8c000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x00a8c000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S3_CLK>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_i2c11_data_clk>;
+                               interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma1 0 3 QCOM_GPI_I2C>,
+                                      <&gpi_dma1 1 3 QCOM_GPI_I2C>;
+                               dma-names = "tx", "rx";
+                               status = "disabled";
+                       };
 
-                       power-domains = <&rpmhpd SM8450_CX>,
-                                       <&rpmhpd SM8450_MXC>;
-                       power-domain-names = "cx", "mxc";
+                       spi11: spi@a8c000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x00a8c000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S3_CLK>;
+                               interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi11_data_clk>, <&qup_spi11_cs>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma1 0 3 QCOM_GPI_SPI>,
+                                      <&gpi_dma1 1 3 QCOM_GPI_SPI>;
+                               dma-names = "tx", "rx";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
 
-                       memory-region = <&cdsp_mem>;
+                       i2c12: i2c@a90000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x00a90000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S4_CLK>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_i2c12_data_clk>;
+                               interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma1 0 4 QCOM_GPI_I2C>,
+                                      <&gpi_dma1 1 4 QCOM_GPI_I2C>;
+                               dma-names = "tx", "rx";
+                               status = "disabled";
+                       };
 
-                       qcom,qmp = <&aoss_qmp>;
+                       spi12: spi@a90000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x00a90000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S4_CLK>;
+                               interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi12_data_clk>, <&qup_spi12_cs>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma1 0 4 QCOM_GPI_SPI>,
+                                      <&gpi_dma1 1 4 QCOM_GPI_SPI>;
+                               dma-names = "tx", "rx";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
 
-                       qcom,smem-states = <&smp2p_cdsp_out 0>;
-                       qcom,smem-state-names = "stop";
+                       i2c13: i2c@a94000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0 0x00a94000 0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S5_CLK>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_i2c13_data_clk>;
+                               interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma1 0 5 QCOM_GPI_I2C>,
+                                      <&gpi_dma1 1 5 QCOM_GPI_I2C>;
+                               dma-names = "tx", "rx";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
 
-                       status = "disabled";
+                       spi13: spi@a94000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x00a94000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S5_CLK>;
+                               interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi13_data_clk>, <&qup_spi13_cs>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma1 0 5 QCOM_GPI_SPI>,
+                                      <&gpi_dma1 1 5 QCOM_GPI_SPI>;
+                               dma-names = "tx", "rx";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
 
-                       glink-edge {
-                               interrupts-extended = <&ipcc IPCC_CLIENT_CDSP
-                                                            IPCC_MPROC_SIGNAL_GLINK_QMP
-                                                            IRQ_TYPE_EDGE_RISING>;
-                               mboxes = <&ipcc IPCC_CLIENT_CDSP
-                                               IPCC_MPROC_SIGNAL_GLINK_QMP>;
+                       i2c14: i2c@a98000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0 0x00a98000 0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S6_CLK>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_i2c14_data_clk>;
+                               interrupts = <GIC_SPI 363 IRQ_TYPE_LEVEL_HIGH>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma1 0 6 QCOM_GPI_I2C>,
+                                      <&gpi_dma1 1 6 QCOM_GPI_I2C>;
+                               dma-names = "tx", "rx";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
 
-                               label = "cdsp";
-                               qcom,remote-pid = <5>;
+                       spi14: spi@a98000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x00a98000 0x0 0x4000>;
+                               clock-names = "se";
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S6_CLK>;
+                               interrupts = <GIC_SPI 363 IRQ_TYPE_LEVEL_HIGH>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi14_data_clk>, <&qup_spi14_cs>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&system_noc MASTER_A2NOC_SNOC 0 &gem_noc SLAVE_LLCC 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config", "qup-memory";
+                               dmas = <&gpi_dma1 0 6 QCOM_GPI_SPI>,
+                                      <&gpi_dma1 1 6 QCOM_GPI_SPI>;
+                               dma-names = "tx", "rx";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
                        };
                };
 
-               remoteproc_mpss: remoteproc@4080000 {
-                       compatible = "qcom,sm8450-mpss-pas";
-                       reg = <0x0 0x04080000 0x0 0x4040>;
+               pcie0: pci@1c00000 {
+                       compatible = "qcom,pcie-sm8450-pcie0";
+                       reg = <0 0x01c00000 0 0x3000>,
+                             <0 0x60000000 0 0xf1d>,
+                             <0 0x60000f20 0 0xa8>,
+                             <0 0x60001000 0 0x1000>,
+                             <0 0x60100000 0 0x100000>;
+                       reg-names = "parf", "dbi", "elbi", "atu", "config";
+                       device_type = "pci";
+                       linux,pci-domain = <0>;
+                       bus-range = <0x00 0xff>;
+                       num-lanes = <1>;
+
+                       #address-cells = <3>;
+                       #size-cells = <2>;
 
-                       interrupts-extended = <&intc GIC_SPI 264 IRQ_TYPE_LEVEL_HIGH>,
-                                             <&smp2p_modem_in 0 IRQ_TYPE_EDGE_RISING>,
-                                             <&smp2p_modem_in 1 IRQ_TYPE_EDGE_RISING>,
-                                             <&smp2p_modem_in 2 IRQ_TYPE_EDGE_RISING>,
-                                             <&smp2p_modem_in 3 IRQ_TYPE_EDGE_RISING>,
-                                             <&smp2p_modem_in 7 IRQ_TYPE_EDGE_RISING>;
-                       interrupt-names = "wdog", "fatal", "ready", "handover",
-                                         "stop-ack", "shutdown-ack";
+                       ranges = <0x01000000 0x0 0x60200000 0 0x60200000 0x0 0x100000>,
+                                <0x02000000 0x0 0x60300000 0 0x60300000 0x0 0x3d00000>;
+
+                       interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "msi";
+                       #interrupt-cells = <1>;
+                       interrupt-map-mask = <0 0 0 0x7>;
+                       interrupt-map = <0 0 0 1 &intc 0 0 0 149 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
+                                       <0 0 0 2 &intc 0 0 0 150 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
+                                       <0 0 0 3 &intc 0 0 0 151 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
+                                       <0 0 0 4 &intc 0 0 0 152 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
+
+                       clocks = <&gcc GCC_PCIE_0_PIPE_CLK>,
+                                <&gcc GCC_PCIE_0_PIPE_CLK_SRC>,
+                                <&pcie0_lane>,
+                                <&rpmhcc RPMH_CXO_CLK>,
+                                <&gcc GCC_PCIE_0_AUX_CLK>,
+                                <&gcc GCC_PCIE_0_CFG_AHB_CLK>,
+                                <&gcc GCC_PCIE_0_MSTR_AXI_CLK>,
+                                <&gcc GCC_PCIE_0_SLV_AXI_CLK>,
+                                <&gcc GCC_PCIE_0_SLV_Q2A_AXI_CLK>,
+                                <&gcc GCC_DDRSS_PCIE_SF_TBU_CLK>,
+                                <&gcc GCC_AGGRE_NOC_PCIE_0_AXI_CLK>,
+                                <&gcc GCC_AGGRE_NOC_PCIE_1_AXI_CLK>;
+                       clock-names = "pipe",
+                                     "pipe_mux",
+                                     "phy_pipe",
+                                     "ref",
+                                     "aux",
+                                     "cfg",
+                                     "bus_master",
+                                     "bus_slave",
+                                     "slave_q2a",
+                                     "ddrss_sf_tbu",
+                                     "aggre0",
+                                     "aggre1";
+
+                       iommus = <&apps_smmu 0x1c00 0x7f>;
+                       iommu-map = <0x0   &apps_smmu 0x1c00 0x1>,
+                                   <0x100 &apps_smmu 0x1c01 0x1>;
+
+                       resets = <&gcc GCC_PCIE_0_BCR>;
+                       reset-names = "pci";
+
+                       power-domains = <&gcc PCIE_0_GDSC>;
+                       power-domain-names = "gdsc";
+
+                       phys = <&pcie0_lane>;
+                       phy-names = "pciephy";
+
+                       perst-gpios = <&tlmm 94 GPIO_ACTIVE_LOW>;
+                       wake-gpios = <&tlmm 96 GPIO_ACTIVE_HIGH>;
+
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pcie0_default_state>;
+
+                       status = "disabled";
+               };
+
+               pcie0_phy: phy@1c06000 {
+                       compatible = "qcom,sm8450-qmp-gen3x1-pcie-phy";
+                       reg = <0 0x01c06000 0 0x200>;
+                       #address-cells = <2>;
+                       #size-cells = <2>;
+                       ranges;
+                       clocks = <&gcc GCC_PCIE_0_AUX_CLK>,
+                                <&gcc GCC_PCIE_0_CFG_AHB_CLK>,
+                                <&gcc GCC_PCIE_0_CLKREF_EN>,
+                                <&gcc GCC_PCIE_0_PHY_RCHNG_CLK>;
+                       clock-names = "aux", "cfg_ahb", "ref", "refgen";
+
+                       resets = <&gcc GCC_PCIE_0_PHY_BCR>;
+                       reset-names = "phy";
+
+                       assigned-clocks = <&gcc GCC_PCIE_0_PHY_RCHNG_CLK>;
+                       assigned-clock-rates = <100000000>;
+
+                       status = "disabled";
+
+                       pcie0_lane: phy@1c06200 {
+                               reg = <0 0x1c06e00 0 0x200>, /* tx */
+                                     <0 0x1c07000 0 0x200>, /* rx */
+                                     <0 0x1c06200 0 0x200>, /* pcs */
+                                     <0 0x1c06600 0 0x200>; /* pcs_pcie */
+                               clocks = <&gcc GCC_PCIE_0_PIPE_CLK>;
+                               clock-names = "pipe0";
+
+                               #clock-cells = <0>;
+                               #phy-cells = <0>;
+                               clock-output-names = "pcie_0_pipe_clk";
+                       };
+               };
+
+               pcie1: pci@1c08000 {
+                       compatible = "qcom,pcie-sm8450-pcie1";
+                       reg = <0 0x01c08000 0 0x3000>,
+                             <0 0x40000000 0 0xf1d>,
+                             <0 0x40000f20 0 0xa8>,
+                             <0 0x40001000 0 0x1000>,
+                             <0 0x40100000 0 0x100000>;
+                       reg-names = "parf", "dbi", "elbi", "atu", "config";
+                       device_type = "pci";
+                       linux,pci-domain = <1>;
+                       bus-range = <0x00 0xff>;
+                       num-lanes = <2>;
+
+                       #address-cells = <3>;
+                       #size-cells = <2>;
+
+                       ranges = <0x01000000 0x0 0x40200000 0 0x40200000 0x0 0x100000>,
+                                <0x02000000 0x0 0x40300000 0 0x40300000 0x0 0x1fd00000>;
+
+                       interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "msi";
+                       #interrupt-cells = <1>;
+                       interrupt-map-mask = <0 0 0 0x7>;
+                       interrupt-map = <0 0 0 1 &intc 0 0 0 434 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
+                                       <0 0 0 2 &intc 0 0 0 435 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
+                                       <0 0 0 3 &intc 0 0 0 438 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
+                                       <0 0 0 4 &intc 0 0 0 439 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
+
+                       clocks = <&gcc GCC_PCIE_1_PIPE_CLK>,
+                                <&gcc GCC_PCIE_1_PIPE_CLK_SRC>,
+                                <&pcie1_lane>,
+                                <&rpmhcc RPMH_CXO_CLK>,
+                                <&gcc GCC_PCIE_1_AUX_CLK>,
+                                <&gcc GCC_PCIE_1_CFG_AHB_CLK>,
+                                <&gcc GCC_PCIE_1_MSTR_AXI_CLK>,
+                                <&gcc GCC_PCIE_1_SLV_AXI_CLK>,
+                                <&gcc GCC_PCIE_1_SLV_Q2A_AXI_CLK>,
+                                <&gcc GCC_DDRSS_PCIE_SF_TBU_CLK>,
+                                <&gcc GCC_AGGRE_NOC_PCIE_1_AXI_CLK>;
+                       clock-names = "pipe",
+                                     "pipe_mux",
+                                     "phy_pipe",
+                                     "ref",
+                                     "aux",
+                                     "cfg",
+                                     "bus_master",
+                                     "bus_slave",
+                                     "slave_q2a",
+                                     "ddrss_sf_tbu",
+                                     "aggre1";
+
+                       iommus = <&apps_smmu 0x1c80 0x7f>;
+                       iommu-map = <0x0   &apps_smmu 0x1c80 0x1>,
+                                   <0x100 &apps_smmu 0x1c81 0x1>;
+
+                       resets = <&gcc GCC_PCIE_1_BCR>;
+                       reset-names = "pci";
+
+                       power-domains = <&gcc PCIE_1_GDSC>;
+                       power-domain-names = "gdsc";
+
+                       phys = <&pcie1_lane>;
+                       phy-names = "pciephy";
+
+                       perst-gpio = <&tlmm 97 GPIO_ACTIVE_LOW>;
+                       enable-gpio = <&tlmm 99 GPIO_ACTIVE_HIGH>;
+
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pcie1_default_state>;
+
+                       status = "disabled";
+               };
+
+               pcie1_phy: phy@1c0f000 {
+                       compatible = "qcom,sm8450-qmp-gen4x2-pcie-phy";
+                       reg = <0 0x01c0f000 0 0x200>;
+                       #address-cells = <2>;
+                       #size-cells = <2>;
+                       ranges;
+                       clocks = <&gcc GCC_PCIE_1_PHY_AUX_CLK>,
+                                <&gcc GCC_PCIE_1_CFG_AHB_CLK>,
+                                <&gcc GCC_PCIE_1_CLKREF_EN>,
+                                <&gcc GCC_PCIE_1_PHY_RCHNG_CLK>;
+                       clock-names = "aux", "cfg_ahb", "ref", "refgen";
+
+                       resets = <&gcc GCC_PCIE_1_PHY_BCR>;
+                       reset-names = "phy";
+
+                       assigned-clocks = <&gcc GCC_PCIE_1_PHY_RCHNG_CLK>;
+                       assigned-clock-rates = <100000000>;
+
+                       status = "disabled";
+
+                       pcie1_lane: phy@1c0e000 {
+                               reg = <0 0x1c0e000 0 0x200>, /* tx */
+                                     <0 0x1c0e200 0 0x300>, /* rx */
+                                     <0 0x1c0f200 0 0x200>, /* pcs */
+                                     <0 0x1c0e800 0 0x200>, /* tx */
+                                     <0 0x1c0ea00 0 0x300>, /* rx */
+                                     <0 0x1c0f400 0 0xc00>; /* pcs_pcie */
+                               clocks = <&gcc GCC_PCIE_1_PIPE_CLK>;
+                               clock-names = "pipe0";
+
+                               #clock-cells = <0>;
+                               #phy-cells = <0>;
+                               clock-output-names = "pcie_1_pipe_clk";
+                       };
+               };
+
+               config_noc: interconnect@1500000 {
+                       compatible = "qcom,sm8450-config-noc";
+                       reg = <0 0x01500000 0 0x1c000>;
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
+
+               system_noc: interconnect@1680000 {
+                       compatible = "qcom,sm8450-system-noc";
+                       reg = <0 0x01680000 0 0x1e200>;
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
+
+               pcie_noc: interconnect@16c0000 {
+                       compatible = "qcom,sm8450-pcie-anoc";
+                       reg = <0 0x016c0000 0 0xe280>;
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
+
+               aggre1_noc: interconnect@16e0000 {
+                       compatible = "qcom,sm8450-aggre1-noc";
+                       reg = <0 0x016e0000 0 0x1c080>;
+                       #interconnect-cells = <2>;
+                       clocks = <&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>,
+                                <&gcc GCC_AGGRE_USB3_PRIM_AXI_CLK>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
+
+               aggre2_noc: interconnect@1700000 {
+                       compatible = "qcom,sm8450-aggre2-noc";
+                       reg = <0 0x01700000 0 0x31080>;
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+                       clocks = <&gcc GCC_AGGRE_NOC_PCIE_0_AXI_CLK>,
+                                <&gcc GCC_AGGRE_NOC_PCIE_1_AXI_CLK>,
+                                <&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>,
+                                <&rpmhcc RPMH_IPA_CLK>;
+               };
+
+               mmss_noc: interconnect@1740000 {
+                       compatible = "qcom,sm8450-mmss-noc";
+                       reg = <0 0x01740000 0 0x1f080>;
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
+
+               tcsr_mutex: hwlock@1f40000 {
+                       compatible = "qcom,tcsr-mutex";
+                       reg = <0x0 0x01f40000 0x0 0x40000>;
+                       #hwlock-cells = <1>;
+               };
+
+               usb_1_hsphy: phy@88e3000 {
+                       compatible = "qcom,sm8450-usb-hs-phy",
+                                    "qcom,usb-snps-hs-7nm-phy";
+                       reg = <0 0x088e3000 0 0x400>;
+                       status = "disabled";
+                       #phy-cells = <0>;
+
+                       clocks = <&rpmhcc RPMH_CXO_CLK>;
+                       clock-names = "ref";
+
+                       resets = <&gcc GCC_QUSB2PHY_PRIM_BCR>;
+               };
+
+               usb_1_qmpphy: phy-wrapper@88e9000 {
+                       compatible = "qcom,sm8450-qmp-usb3-phy";
+                       reg = <0 0x088e9000 0 0x200>,
+                             <0 0x088e8000 0 0x20>;
+                       status = "disabled";
+                       #address-cells = <2>;
+                       #size-cells = <2>;
+                       ranges;
+
+                       clocks = <&gcc GCC_USB3_PRIM_PHY_AUX_CLK>,
+                                <&rpmhcc RPMH_CXO_CLK>,
+                                <&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>;
+                       clock-names = "aux", "ref_clk_src", "com_aux";
+
+                       resets = <&gcc GCC_USB3_DP_PHY_PRIM_BCR>,
+                                <&gcc GCC_USB3_PHY_PRIM_BCR>;
+                       reset-names = "phy", "common";
+
+                       usb_1_ssphy: phy@88e9200 {
+                               reg = <0 0x088e9200 0 0x200>,
+                                     <0 0x088e9400 0 0x200>,
+                                     <0 0x088e9c00 0 0x400>,
+                                     <0 0x088e9600 0 0x200>,
+                                     <0 0x088e9800 0 0x200>,
+                                     <0 0x088e9a00 0 0x100>;
+                               #phy-cells = <0>;
+                               #clock-cells = <1>;
+                               clocks = <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>;
+                               clock-names = "pipe0";
+                               clock-output-names = "usb3_phy_pipe_clk_src";
+                       };
+               };
+
+               remoteproc_slpi: remoteproc@2400000 {
+                       compatible = "qcom,sm8450-slpi-pas";
+                       reg = <0 0x02400000 0 0x4000>;
+
+                       interrupts-extended = <&pdc 9 IRQ_TYPE_LEVEL_HIGH>,
+                                             <&smp2p_slpi_in 0 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_slpi_in 1 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_slpi_in 2 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_slpi_in 3 IRQ_TYPE_EDGE_RISING>;
+                       interrupt-names = "wdog", "fatal", "ready",
+                                         "handover", "stop-ack";
 
                        clocks = <&rpmhcc RPMH_CXO_CLK>;
                        clock-names = "xo";
 
-                       power-domains = <&rpmhpd 0>,
-                                       <&rpmhpd 12>;
-                       power-domain-names = "cx", "mss";
+                       power-domains = <&rpmhpd SM8450_LCX>,
+                                       <&rpmhpd SM8450_LMX>;
+                       power-domain-names = "lcx", "lmx";
 
-                       memory-region = <&mpss_mem>;
+                       memory-region = <&slpi_mem>;
 
                        qcom,qmp = <&aoss_qmp>;
 
-                       qcom,smem-states = <&smp2p_modem_out 0>;
+                       qcom,smem-states = <&smp2p_slpi_out 0>;
                        qcom,smem-state-names = "stop";
 
                        status = "disabled";
 
                        glink-edge {
-                               interrupts-extended = <&ipcc IPCC_CLIENT_MPSS
+                               interrupts-extended = <&ipcc IPCC_CLIENT_SLPI
                                                             IPCC_MPROC_SIGNAL_GLINK_QMP
                                                             IRQ_TYPE_EDGE_RISING>;
-                               mboxes = <&ipcc IPCC_CLIENT_MPSS
+                               mboxes = <&ipcc IPCC_CLIENT_SLPI
                                                IPCC_MPROC_SIGNAL_GLINK_QMP>;
-                               interrupts = <GIC_SPI 449 IRQ_TYPE_EDGE_RISING>;
-                               label = "modem";
-                               qcom,remote-pid = <1>;
+
+                               label = "slpi";
+                               qcom,remote-pid = <3>;
+
+                               fastrpc {
+                                       compatible = "qcom,fastrpc";
+                                       qcom,glink-channels = "fastrpcglink-apps-dsp";
+                                       label = "sdsp";
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+
+                                       compute-cb@1 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <1>;
+                                               iommus = <&apps_smmu 0x0541 0x0>;
+                                       };
+
+                                       compute-cb@2 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <2>;
+                                               iommus = <&apps_smmu 0x0542 0x0>;
+                                       };
+
+                                       compute-cb@3 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <3>;
+                                               iommus = <&apps_smmu 0x0543 0x0>;
+                                               /* note: shared-cb = <4> in downstream */
+                                       };
+                               };
+                       };
+               };
+
+               remoteproc_adsp: remoteproc@30000000 {
+                       compatible = "qcom,sm8450-adsp-pas";
+                       reg = <0 0x030000000 0 0x100>;
+
+                       interrupts-extended = <&pdc 6 IRQ_TYPE_LEVEL_HIGH>,
+                                             <&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_adsp_in 1 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_adsp_in 2 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_adsp_in 3 IRQ_TYPE_EDGE_RISING>;
+                       interrupt-names = "wdog", "fatal", "ready",
+                                         "handover", "stop-ack";
+
+                       clocks = <&rpmhcc RPMH_CXO_CLK>;
+                       clock-names = "xo";
+
+                       power-domains = <&rpmhpd SM8450_LCX>,
+                                       <&rpmhpd SM8450_LMX>;
+                       power-domain-names = "lcx", "lmx";
+
+                       memory-region = <&adsp_mem>;
+
+                       qcom,qmp = <&aoss_qmp>;
+
+                       qcom,smem-states = <&smp2p_adsp_out 0>;
+                       qcom,smem-state-names = "stop";
+
+                       status = "disabled";
+
+                       remoteproc_adsp_glink: glink-edge {
+                               interrupts-extended = <&ipcc IPCC_CLIENT_LPASS
+                                                            IPCC_MPROC_SIGNAL_GLINK_QMP
+                                                            IRQ_TYPE_EDGE_RISING>;
+                               mboxes = <&ipcc IPCC_CLIENT_LPASS
+                                               IPCC_MPROC_SIGNAL_GLINK_QMP>;
+
+                               label = "lpass";
+                               qcom,remote-pid = <2>;
+
+                               fastrpc {
+                                       compatible = "qcom,fastrpc";
+                                       qcom,glink-channels = "fastrpcglink-apps-dsp";
+                                       label = "adsp";
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+
+                                       compute-cb@3 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <3>;
+                                               iommus = <&apps_smmu 0x1803 0x0>;
+                                       };
+
+                                       compute-cb@4 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <4>;
+                                               iommus = <&apps_smmu 0x1804 0x0>;
+                                       };
+
+                                       compute-cb@5 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <5>;
+                                               iommus = <&apps_smmu 0x1805 0x0>;
+                                       };
+                               };
+                       };
+               };
+
+               remoteproc_cdsp: remoteproc@32300000 {
+                       compatible = "qcom,sm8450-cdsp-pas";
+                       reg = <0 0x032300000 0 0x1400000>;
+
+                       interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_LEVEL_HIGH>,
+                                             <&smp2p_cdsp_in 0 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_cdsp_in 1 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_cdsp_in 2 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_cdsp_in 3 IRQ_TYPE_EDGE_RISING>;
+                       interrupt-names = "wdog", "fatal", "ready",
+                                         "handover", "stop-ack";
+
+                       clocks = <&rpmhcc RPMH_CXO_CLK>;
+                       clock-names = "xo";
+
+                       power-domains = <&rpmhpd SM8450_CX>,
+                                       <&rpmhpd SM8450_MXC>;
+                       power-domain-names = "cx", "mxc";
+
+                       memory-region = <&cdsp_mem>;
+
+                       qcom,qmp = <&aoss_qmp>;
+
+                       qcom,smem-states = <&smp2p_cdsp_out 0>;
+                       qcom,smem-state-names = "stop";
+
+                       status = "disabled";
+
+                       glink-edge {
+                               interrupts-extended = <&ipcc IPCC_CLIENT_CDSP
+                                                            IPCC_MPROC_SIGNAL_GLINK_QMP
+                                                            IRQ_TYPE_EDGE_RISING>;
+                               mboxes = <&ipcc IPCC_CLIENT_CDSP
+                                               IPCC_MPROC_SIGNAL_GLINK_QMP>;
+
+                               label = "cdsp";
+                               qcom,remote-pid = <5>;
+
+                               fastrpc {
+                                       compatible = "qcom,fastrpc";
+                                       qcom,glink-channels = "fastrpcglink-apps-dsp";
+                                       label = "cdsp";
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+
+                                       compute-cb@1 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <1>;
+                                               iommus = <&apps_smmu 0x2161 0x0400>,
+                                                        <&apps_smmu 0x1021 0x1420>;
+                                       };
+
+                                       compute-cb@2 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <2>;
+                                               iommus = <&apps_smmu 0x2162 0x0400>,
+                                                        <&apps_smmu 0x1022 0x1420>;
+                                       };
+
+                                       compute-cb@3 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <3>;
+                                               iommus = <&apps_smmu 0x2163 0x0400>,
+                                                        <&apps_smmu 0x1023 0x1420>;
+                                       };
+
+                                       compute-cb@4 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <4>;
+                                               iommus = <&apps_smmu 0x2164 0x0400>,
+                                                        <&apps_smmu 0x1024 0x1420>;
+                                       };
+
+                                       compute-cb@5 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <5>;
+                                               iommus = <&apps_smmu 0x2165 0x0400>,
+                                                        <&apps_smmu 0x1025 0x1420>;
+                                       };
+
+                                       compute-cb@6 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <6>;
+                                               iommus = <&apps_smmu 0x2166 0x0400>,
+                                                        <&apps_smmu 0x1026 0x1420>;
+                                       };
+
+                                       compute-cb@7 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <7>;
+                                               iommus = <&apps_smmu 0x2167 0x0400>,
+                                                        <&apps_smmu 0x1027 0x1420>;
+                                       };
+
+                                       compute-cb@8 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <8>;
+                                               iommus = <&apps_smmu 0x2168 0x0400>,
+                                                        <&apps_smmu 0x1028 0x1420>;
+                                       };
+
+                                       /* note: secure cb9 in downstream */
+                               };
+                       };
+               };
+
+               remoteproc_mpss: remoteproc@4080000 {
+                       compatible = "qcom,sm8450-mpss-pas";
+                       reg = <0x0 0x04080000 0x0 0x4040>;
+
+                       interrupts-extended = <&intc GIC_SPI 264 IRQ_TYPE_LEVEL_HIGH>,
+                                             <&smp2p_modem_in 0 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_modem_in 1 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_modem_in 2 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_modem_in 3 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_modem_in 7 IRQ_TYPE_EDGE_RISING>;
+                       interrupt-names = "wdog", "fatal", "ready", "handover",
+                                         "stop-ack", "shutdown-ack";
+
+                       clocks = <&rpmhcc RPMH_CXO_CLK>;
+                       clock-names = "xo";
+
+                       power-domains = <&rpmhpd 0>,
+                                       <&rpmhpd 12>;
+                       power-domain-names = "cx", "mss";
+
+                       memory-region = <&mpss_mem>;
+
+                       qcom,qmp = <&aoss_qmp>;
+
+                       qcom,smem-states = <&smp2p_modem_out 0>;
+                       qcom,smem-state-names = "stop";
+
+                       status = "disabled";
+
+                       glink-edge {
+                               interrupts-extended = <&ipcc IPCC_CLIENT_MPSS
+                                                            IPCC_MPROC_SIGNAL_GLINK_QMP
+                                                            IRQ_TYPE_EDGE_RISING>;
+                               mboxes = <&ipcc IPCC_CLIENT_MPSS
+                                               IPCC_MPROC_SIGNAL_GLINK_QMP>;
+                               interrupts = <GIC_SPI 449 IRQ_TYPE_EDGE_RISING>;
+                               label = "modem";
+                               qcom,remote-pid = <1>;
+                       };
+               };
+
+               pdc: interrupt-controller@b220000 {
+                       compatible = "qcom,sm8450-pdc", "qcom,pdc";
+                       reg = <0 0x0b220000 0 0x30000>, <0 0x174000f0 0 0x64>;
+                       qcom,pdc-ranges = <0 480 12>, <14 494 24>, <40 520 54>,
+                                         <94 609 31>, <125 63 1>, <126 716 12>;
+                       #interrupt-cells = <2>;
+                       interrupt-parent = <&intc>;
+                       interrupt-controller;
+               };
+
+               tsens0: thermal-sensor@c263000 {
+                       compatible = "qcom,sm8450-tsens", "qcom,tsens-v2";
+                       reg = <0 0x0c263000 0 0x1000>, /* TM */
+                             <0 0x0c222000 0 0x1000>; /* SROT */
+                       #qcom,sensors = <16>;
+                       interrupts = <GIC_SPI 506 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 508 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "uplow", "critical";
+                       #thermal-sensor-cells = <1>;
+               };
+
+               tsens1: thermal-sensor@c265000 {
+                       compatible = "qcom,sm8450-tsens", "qcom,tsens-v2";
+                       reg = <0 0x0c265000 0 0x1000>, /* TM */
+                             <0 0x0c223000 0 0x1000>; /* SROT */
+                       #qcom,sensors = <16>;
+                       interrupts = <GIC_SPI 507 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 509 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "uplow", "critical";
+                       #thermal-sensor-cells = <1>;
+               };
+
+               aoss_qmp: power-controller@c300000 {
+                       compatible = "qcom,sm8450-aoss-qmp", "qcom,aoss-qmp";
+                       reg = <0 0x0c300000 0 0x400>;
+                       interrupts-extended = <&ipcc IPCC_CLIENT_AOP IPCC_MPROC_SIGNAL_GLINK_QMP
+                                                    IRQ_TYPE_EDGE_RISING>;
+                       mboxes = <&ipcc IPCC_CLIENT_AOP IPCC_MPROC_SIGNAL_GLINK_QMP>;
+
+                       #clock-cells = <0>;
+               };
+
+               ipcc: mailbox@ed18000 {
+                       compatible = "qcom,sm8450-ipcc", "qcom,ipcc";
+                       reg = <0 0x0ed18000 0 0x1000>;
+                       interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-controller;
+                       #interrupt-cells = <3>;
+                       #mbox-cells = <2>;
+               };
+
+               tlmm: pinctrl@f100000 {
+                       compatible = "qcom,sm8450-tlmm";
+                       reg = <0 0x0f100000 0 0x300000>;
+                       interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+                       gpio-ranges = <&tlmm 0 0 211>;
+                       wakeup-parent = <&pdc>;
+
+                       pcie0_default_state: pcie0-default-state {
+                               perst {
+                                       pins = "gpio94";
+                                       function = "gpio";
+                                       drive-strength = <2>;
+                                       bias-pull-down;
+                               };
+
+                               clkreq {
+                                       pins = "gpio95";
+                                       function = "pcie0_clkreqn";
+                                       drive-strength = <2>;
+                                       bias-pull-up;
+                               };
+
+                               wake {
+                                       pins = "gpio96";
+                                       function = "gpio";
+                                       drive-strength = <2>;
+                                       bias-pull-up;
+                               };
+                       };
+
+                       pcie1_default_state: pcie1-default-state {
+                               perst {
+                                       pins = "gpio97";
+                                       function = "gpio";
+                                       drive-strength = <2>;
+                                       bias-pull-down;
+                               };
+
+                               clkreq {
+                                       pins = "gpio98";
+                                       function = "pcie1_clkreqn";
+                                       drive-strength = <2>;
+                                       bias-pull-up;
+                               };
+
+                               wake {
+                                       pins = "gpio99";
+                                       function = "gpio";
+                                       drive-strength = <2>;
+                                       bias-pull-up;
+                               };
+                       };
+
+                       qup_i2c0_data_clk: qup-i2c0-data-clk {
+                               pins = "gpio0", "gpio1";
+                               function = "qup0";
+                       };
+
+                       qup_i2c1_data_clk: qup-i2c1-data-clk {
+                               pins = "gpio4", "gpio5";
+                               function = "qup1";
+                       };
+
+                       qup_i2c2_data_clk: qup-i2c2-data-clk {
+                               pins = "gpio8", "gpio9";
+                               function = "qup2";
+                       };
+
+                       qup_i2c3_data_clk: qup-i2c3-data-clk {
+                               pins = "gpio12", "gpio13";
+                               function = "qup3";
+                       };
+
+                       qup_i2c4_data_clk: qup-i2c4-data-clk {
+                               pins = "gpio16", "gpio17";
+                               function = "qup4";
+                       };
+
+                       qup_i2c5_data_clk: qup-i2c5-data-clk {
+                               pins = "gpio206", "gpio207";
+                               function = "qup5";
+                       };
+
+                       qup_i2c6_data_clk: qup-i2c6-data-clk {
+                               pins = "gpio20", "gpio21";
+                               function = "qup6";
+                       };
+
+                       qup_i2c8_data_clk: qup-i2c8-data-clk {
+                               pins = "gpio28", "gpio29";
+                               function = "qup8";
+                       };
+
+                       qup_i2c9_data_clk: qup-i2c9-data-clk {
+                               pins = "gpio32", "gpio33";
+                               function = "qup9";
+                       };
+
+                       qup_i2c10_data_clk: qup-i2c10-data-clk {
+                               pins = "gpio36", "gpio37";
+                               function = "qup10";
+                       };
+
+                       qup_i2c11_data_clk: qup-i2c11-data-clk {
+                               pins = "gpio40", "gpio41";
+                               function = "qup11";
+                       };
+
+                       qup_i2c12_data_clk: qup-i2c12-data-clk {
+                               pins = "gpio44", "gpio45";
+                               function = "qup12";
+                       };
+
+                       qup_i2c13_data_clk: qup-i2c13-data-clk {
+                               pins = "gpio48", "gpio49";
+                               function = "qup13";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_i2c14_data_clk: qup-i2c14-data-clk {
+                               pins = "gpio52", "gpio53";
+                               function = "qup14";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_i2c15_data_clk: qup-i2c15-data-clk {
+                               pins = "gpio56", "gpio57";
+                               function = "qup15";
+                       };
+
+                       qup_i2c16_data_clk: qup-i2c16-data-clk {
+                               pins = "gpio60", "gpio61";
+                               function = "qup16";
+                       };
+
+                       qup_i2c17_data_clk: qup-i2c17-data-clk {
+                               pins = "gpio64", "gpio65";
+                               function = "qup17";
+                       };
+
+                       qup_i2c18_data_clk: qup-i2c18-data-clk {
+                               pins = "gpio68", "gpio69";
+                               function = "qup18";
+                       };
+
+                       qup_i2c19_data_clk: qup-i2c19-data-clk {
+                               pins = "gpio72", "gpio73";
+                               function = "qup19";
+                       };
+
+                       qup_i2c20_data_clk: qup-i2c20-data-clk {
+                               pins = "gpio76", "gpio77";
+                               function = "qup20";
+                       };
+
+                       qup_i2c21_data_clk: qup-i2c21-data-clk {
+                               pins = "gpio80", "gpio81";
+                               function = "qup21";
+                       };
+
+                       qup_spi0_cs: qup-spi0-cs {
+                               pins = "gpio3";
+                               function = "qup0";
+                       };
+
+                       qup_spi0_data_clk: qup-spi0-data-clk {
+                               pins = "gpio0", "gpio1", "gpio2";
+                               function = "qup0";
+                       };
+
+                       qup_spi1_cs: qup-spi1-cs {
+                               pins = "gpio7";
+                               function = "qup1";
+                       };
+
+                       qup_spi1_data_clk: qup-spi1-data-clk {
+                               pins = "gpio4", "gpio5", "gpio6";
+                               function = "qup1";
+                       };
+
+                       qup_spi2_cs: qup-spi2-cs {
+                               pins = "gpio11";
+                               function = "qup2";
+                       };
+
+                       qup_spi2_data_clk: qup-spi2-data-clk {
+                               pins = "gpio8", "gpio9", "gpio10";
+                               function = "qup2";
+                       };
+
+                       qup_spi3_cs: qup-spi3-cs {
+                               pins = "gpio15";
+                               function = "qup3";
+                       };
+
+                       qup_spi3_data_clk: qup-spi3-data-clk {
+                               pins = "gpio12", "gpio13", "gpio14";
+                               function = "qup3";
+                       };
+
+                       qup_spi4_cs: qup-spi4-cs {
+                               pins = "gpio19";
+                               function = "qup4";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi4_data_clk: qup-spi4-data-clk {
+                               pins = "gpio16", "gpio17", "gpio18";
+                               function = "qup4";
+                       };
+
+                       qup_spi5_cs: qup-spi5-cs {
+                               pins = "gpio85";
+                               function = "qup5";
+                       };
+
+                       qup_spi5_data_clk: qup-spi5-data-clk {
+                               pins = "gpio206", "gpio207", "gpio84";
+                               function = "qup5";
+                       };
+
+                       qup_spi6_cs: qup-spi6-cs {
+                               pins = "gpio23";
+                               function = "qup6";
+                       };
+
+                       qup_spi6_data_clk: qup-spi6-data-clk {
+                               pins = "gpio20", "gpio21", "gpio22";
+                               function = "qup6";
+                       };
+
+                       qup_spi8_cs: qup-spi8-cs {
+                               pins = "gpio31";
+                               function = "qup8";
+                       };
+
+                       qup_spi8_data_clk: qup-spi8-data-clk {
+                               pins = "gpio28", "gpio29", "gpio30";
+                               function = "qup8";
+                       };
+
+                       qup_spi9_cs: qup-spi9-cs {
+                               pins = "gpio35";
+                               function = "qup9";
+                       };
+
+                       qup_spi9_data_clk: qup-spi9-data-clk {
+                               pins = "gpio32", "gpio33", "gpio34";
+                               function = "qup9";
+                       };
+
+                       qup_spi10_cs: qup-spi10-cs {
+                               pins = "gpio39";
+                               function = "qup10";
+                       };
+
+                       qup_spi10_data_clk: qup-spi10-data-clk {
+                               pins = "gpio36", "gpio37", "gpio38";
+                               function = "qup10";
+                       };
+
+                       qup_spi11_cs: qup-spi11-cs {
+                               pins = "gpio43";
+                               function = "qup11";
+                       };
+
+                       qup_spi11_data_clk: qup-spi11-data-clk {
+                               pins = "gpio40", "gpio41", "gpio42";
+                               function = "qup11";
+                       };
+
+                       qup_spi12_cs: qup-spi12-cs {
+                               pins = "gpio47";
+                               function = "qup12";
+                       };
+
+                       qup_spi12_data_clk: qup-spi12-data-clk {
+                               pins = "gpio44", "gpio45", "gpio46";
+                               function = "qup12";
+                       };
+
+                       qup_spi13_cs: qup-spi13-cs {
+                               pins = "gpio51";
+                               function = "qup13";
+                       };
+
+                       qup_spi13_data_clk: qup-spi13-data-clk {
+                               pins = "gpio48", "gpio49", "gpio50";
+                               function = "qup13";
+                       };
+
+                       qup_spi14_cs: qup-spi14-cs {
+                               pins = "gpio55";
+                               function = "qup14";
+                       };
+
+                       qup_spi14_data_clk: qup-spi14-data-clk {
+                               pins = "gpio52", "gpio53", "gpio54";
+                               function = "qup14";
+                       };
+
+                       qup_spi15_cs: qup-spi15-cs {
+                               pins = "gpio59";
+                               function = "qup15";
+                       };
+
+                       qup_spi15_data_clk: qup-spi15-data-clk {
+                               pins = "gpio56", "gpio57", "gpio58";
+                               function = "qup15";
+                       };
+
+                       qup_spi16_cs: qup-spi16-cs {
+                               pins = "gpio63";
+                               function = "qup16";
+                       };
+
+                       qup_spi16_data_clk: qup-spi16-data-clk {
+                               pins = "gpio60", "gpio61", "gpio62";
+                               function = "qup16";
+                       };
+
+                       qup_spi17_cs: qup-spi17-cs {
+                               pins = "gpio67";
+                               function = "qup17";
+                       };
+
+                       qup_spi17_data_clk: qup-spi17-data-clk {
+                               pins = "gpio64", "gpio65", "gpio66";
+                               function = "qup17";
+                       };
+
+                       qup_spi18_cs: qup-spi18-cs {
+                               pins = "gpio71";
+                               function = "qup18";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi18_data_clk: qup-spi18-data-clk {
+                               pins = "gpio68", "gpio69", "gpio70";
+                               function = "qup18";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi19_cs: qup-spi19-cs {
+                               pins = "gpio75";
+                               function = "qup19";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi19_data_clk: qup-spi19-data-clk {
+                               pins = "gpio72", "gpio73", "gpio74";
+                               function = "qup19";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi20_cs: qup-spi20-cs {
+                               pins = "gpio79";
+                               function = "qup20";
+                       };
+
+                       qup_spi20_data_clk: qup-spi20-data-clk {
+                               pins = "gpio76", "gpio77", "gpio78";
+                               function = "qup20";
+                       };
+
+                       qup_spi21_cs: qup-spi21-cs {
+                               pins = "gpio83";
+                               function = "qup21";
+                       };
+
+                       qup_spi21_data_clk: qup-spi21-data-clk {
+                               pins = "gpio80", "gpio81", "gpio82";
+                               function = "qup21";
+                       };
+
+                       qup_uart7_rx: qup-uart7-rx {
+                               pins = "gpio26";
+                               function = "qup7";
+                               drive-strength = <2>;
+                               bias-disable;
+                       };
+
+                       qup_uart7_tx: qup-uart7-tx {
+                               pins = "gpio27";
+                               function = "qup7";
+                               drive-strength = <2>;
+                               bias-disable;
+                       };
+               };
+
+               apps_smmu: iommu@15000000 {
+                       compatible = "qcom,sm8450-smmu-500", "arm,mmu-500";
+                       reg = <0 0x15000000 0 0x100000>;
+                       #iommu-cells = <2>;
+                       #global-interrupts = <1>;
+                       interrupts =    <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 181 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 185 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 395 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 396 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 397 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 398 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 399 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 400 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 401 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 402 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 403 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 404 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 405 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 406 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 407 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 408 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 409 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 412 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 707 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 690 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 691 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 692 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 693 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 694 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 695 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 696 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 697 IRQ_TYPE_LEVEL_HIGH>;
+               };
+
+               intc: interrupt-controller@17100000 {
+                       compatible = "arm,gic-v3";
+                       #interrupt-cells = <3>;
+                       interrupt-controller;
+                       #redistributor-regions = <1>;
+                       redistributor-stride = <0x0 0x40000>;
+                       reg = <0x0 0x17100000 0x0 0x10000>,     /* GICD */
+                             <0x0 0x17180000 0x0 0x200000>;    /* GICR * 8 */
+                       interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
+               };
+
+               timer@17420000 {
+                       compatible = "arm,armv7-timer-mem";
+                       #address-cells = <2>;
+                       #size-cells = <2>;
+                       ranges;
+                       reg = <0x0 0x17420000 0x0 0x1000>;
+                       clock-frequency = <19200000>;
+
+                       frame@17421000 {
+                               frame-number = <0>;
+                               interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
+                               reg = <0x0 0x17421000 0x0 0x1000>,
+                                     <0x0 0x17422000 0x0 0x1000>;
+                       };
+
+                       frame@17423000 {
+                               frame-number = <1>;
+                               interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
+                               reg = <0x0 0x17423000 0x0 0x1000>;
+                               status = "disabled";
+                       };
+
+                       frame@17425000 {
+                               frame-number = <2>;
+                               interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
+                               reg = <0x0 0x17425000 0x0 0x1000>;
+                               status = "disabled";
+                       };
+
+                       frame@17427000 {
+                               frame-number = <3>;
+                               interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
+                               reg = <0x0 0x17427000 0x0 0x1000>;
+                               status = "disabled";
+                       };
+
+                       frame@17429000 {
+                               frame-number = <4>;
+                               interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
+                               reg = <0x0 0x17429000 0x0 0x1000>;
+                               status = "disabled";
+                       };
+
+                       frame@1742b000 {
+                               frame-number = <5>;
+                               interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
+                               reg = <0x0 0x1742b000 0x0 0x1000>;
+                               status = "disabled";
+                       };
+
+                       frame@1742d000 {
+                               frame-number = <6>;
+                               interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
+                               reg = <0x0 0x1742d000 0x0 0x1000>;
+                               status = "disabled";
+                       };
+               };
+
+               apps_rsc: rsc@17a00000 {
+                       label = "apps_rsc";
+                       compatible = "qcom,rpmh-rsc";
+                       reg = <0x0 0x17a00000 0x0 0x10000>,
+                             <0x0 0x17a10000 0x0 0x10000>,
+                             <0x0 0x17a20000 0x0 0x10000>,
+                             <0x0 0x17a30000 0x0 0x10000>;
+                       reg-names = "drv-0", "drv-1", "drv-2", "drv-3";
+                       interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
+                       qcom,tcs-offset = <0xd00>;
+                       qcom,drv-id = <2>;
+                       qcom,tcs-config = <ACTIVE_TCS  3>, <SLEEP_TCS   2>,
+                                         <WAKE_TCS    2>, <CONTROL_TCS 0>;
+
+                       apps_bcm_voter: bcm-voter {
+                               compatible = "qcom,bcm-voter";
+                       };
+
+                       rpmhcc: clock-controller {
+                               compatible = "qcom,sm8450-rpmh-clk";
+                               #clock-cells = <1>;
+                               clock-names = "xo";
+                               clocks = <&xo_board>;
+                       };
+
+                       rpmhpd: power-controller {
+                               compatible = "qcom,sm8450-rpmhpd";
+                               #power-domain-cells = <1>;
+                               operating-points-v2 = <&rpmhpd_opp_table>;
+
+                               rpmhpd_opp_table: opp-table {
+                                       compatible = "operating-points-v2";
+
+                                       rpmhpd_opp_ret: opp1 {
+                                               opp-level = <RPMH_REGULATOR_LEVEL_RETENTION>;
+                                       };
+
+                                       rpmhpd_opp_min_svs: opp2 {
+                                               opp-level = <RPMH_REGULATOR_LEVEL_MIN_SVS>;
+                                       };
+
+                                       rpmhpd_opp_low_svs: opp3 {
+                                               opp-level = <RPMH_REGULATOR_LEVEL_LOW_SVS>;
+                                       };
+
+                                       rpmhpd_opp_svs: opp4 {
+                                               opp-level = <RPMH_REGULATOR_LEVEL_SVS>;
+                                       };
+
+                                       rpmhpd_opp_svs_l1: opp5 {
+                                               opp-level = <RPMH_REGULATOR_LEVEL_SVS_L1>;
+                                       };
+
+                                       rpmhpd_opp_nom: opp6 {
+                                               opp-level = <RPMH_REGULATOR_LEVEL_NOM>;
+                                       };
+
+                                       rpmhpd_opp_nom_l1: opp7 {
+                                               opp-level = <RPMH_REGULATOR_LEVEL_NOM_L1>;
+                                       };
+
+                                       rpmhpd_opp_nom_l2: opp8 {
+                                               opp-level = <RPMH_REGULATOR_LEVEL_NOM_L2>;
+                                       };
+
+                                       rpmhpd_opp_turbo: opp9 {
+                                               opp-level = <RPMH_REGULATOR_LEVEL_TURBO>;
+                                       };
+
+                                       rpmhpd_opp_turbo_l1: opp10 {
+                                               opp-level = <RPMH_REGULATOR_LEVEL_TURBO_L1>;
+                                       };
+                               };
+                       };
+               };
+
+               cpufreq_hw: cpufreq@17d91000 {
+                       compatible = "qcom,sm8450-cpufreq-epss", "qcom,cpufreq-epss";
+                       reg = <0 0x17d91000 0 0x1000>,
+                             <0 0x17d92000 0 0x1000>,
+                             <0 0x17d93000 0 0x1000>;
+                       reg-names = "freq-domain0", "freq-domain1", "freq-domain2";
+                       clocks = <&rpmhcc RPMH_CXO_CLK>, <&gcc GCC_GPLL0>;
+                       clock-names = "xo", "alternate";
+                       interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "dcvsh-irq-0", "dcvsh-irq-1", "dcvsh-irq-2";
+                       #freq-domain-cells = <1>;
+               };
+
+               gem_noc: interconnect@19100000 {
+                       compatible = "qcom,sm8450-gem-noc";
+                       reg = <0 0x19100000 0 0xbb800>;
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
+
+               system-cache-controller@19200000 {
+                       compatible = "qcom,sm8450-llcc";
+                       reg = <0 0x19200000 0 0x580000>, <0 0x19a00000 0 0x80000>;
+                       reg-names = "llcc_base", "llcc_broadcast_base";
+                       interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>;
+               };
+
+               ufs_mem_hc: ufshc@1d84000 {
+                       compatible = "qcom,sm8450-ufshc", "qcom,ufshc",
+                                    "jedec,ufs-2.0";
+                       reg = <0 0x01d84000 0 0x3000>;
+                       interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>;
+                       phys = <&ufs_mem_phy_lanes>;
+                       phy-names = "ufsphy";
+                       lanes-per-direction = <2>;
+                       #reset-cells = <1>;
+                       resets = <&gcc GCC_UFS_PHY_BCR>;
+                       reset-names = "rst";
+
+                       power-domains = <&gcc UFS_PHY_GDSC>;
+
+                       iommus = <&apps_smmu 0xe0 0x0>;
+
+                       interconnects = <&aggre1_noc MASTER_UFS_MEM &mc_virt SLAVE_EBI1>,
+                                       <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_UFS_MEM_CFG>;
+                       interconnect-names = "ufs-ddr", "cpu-ufs";
+                       clock-names =
+                               "core_clk",
+                               "bus_aggr_clk",
+                               "iface_clk",
+                               "core_clk_unipro",
+                               "ref_clk",
+                               "tx_lane0_sync_clk",
+                               "rx_lane0_sync_clk",
+                               "rx_lane1_sync_clk";
+                       clocks =
+                               <&gcc GCC_UFS_PHY_AXI_CLK>,
+                               <&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>,
+                               <&gcc GCC_UFS_PHY_AHB_CLK>,
+                               <&gcc GCC_UFS_PHY_UNIPRO_CORE_CLK>,
+                               <&rpmhcc RPMH_CXO_CLK>,
+                               <&gcc GCC_UFS_PHY_TX_SYMBOL_0_CLK>,
+                               <&gcc GCC_UFS_PHY_RX_SYMBOL_0_CLK>,
+                               <&gcc GCC_UFS_PHY_RX_SYMBOL_1_CLK>;
+                       freq-table-hz =
+                               <75000000 300000000>,
+                               <0 0>,
+                               <0 0>,
+                               <75000000 300000000>,
+                               <75000000 300000000>,
+                               <0 0>,
+                               <0 0>,
+                               <0 0>;
+                       status = "disabled";
+               };
+
+               ufs_mem_phy: phy@1d87000 {
+                       compatible = "qcom,sm8450-qmp-ufs-phy";
+                       reg = <0 0x01d87000 0 0xe10>;
+                       #address-cells = <2>;
+                       #size-cells = <2>;
+                       ranges;
+                       clock-names = "ref", "ref_aux", "qref";
+                       clocks = <&rpmhcc RPMH_CXO_CLK>,
+                                <&gcc GCC_UFS_PHY_PHY_AUX_CLK>,
+                                <&gcc GCC_UFS_0_CLKREF_EN>;
+
+                       resets = <&ufs_mem_hc 0>;
+                       reset-names = "ufsphy";
+                       status = "disabled";
+
+                       ufs_mem_phy_lanes: phy@1d87400 {
+                               reg = <0 0x01d87400 0 0x108>,
+                                     <0 0x01d87600 0 0x1e0>,
+                                     <0 0x01d87c00 0 0x1dc>,
+                                     <0 0x01d87800 0 0x108>,
+                                     <0 0x01d87a00 0 0x1e0>;
+                               #phy-cells = <0>;
+                               #clock-cells = <0>;
+                       };
+               };
+
+               usb_1: usb@a6f8800 {
+                       compatible = "qcom,sm8450-dwc3", "qcom,dwc3";
+                       reg = <0 0x0a6f8800 0 0x400>;
+                       status = "disabled";
+                       #address-cells = <2>;
+                       #size-cells = <2>;
+                       ranges;
+
+                       clocks = <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>,
+                                <&gcc GCC_USB30_PRIM_MASTER_CLK>,
+                                <&gcc GCC_AGGRE_USB3_PRIM_AXI_CLK>,
+                                <&gcc GCC_USB30_PRIM_SLEEP_CLK>,
+                                <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>,
+                                <&gcc GCC_USB3_0_CLKREF_EN>;
+                       clock-names = "cfg_noc",
+                                     "core",
+                                     "iface",
+                                     "sleep",
+                                     "mock_utmi",
+                                     "xo";
+
+                       assigned-clocks = <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>,
+                                         <&gcc GCC_USB30_PRIM_MASTER_CLK>;
+                       assigned-clock-rates = <19200000>, <200000000>;
+
+                       interrupts-extended = <&intc GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>,
+                                             <&pdc 17 IRQ_TYPE_LEVEL_HIGH>,
+                                             <&pdc 15 IRQ_TYPE_EDGE_BOTH>,
+                                             <&pdc 14 IRQ_TYPE_EDGE_BOTH>;
+                       interrupt-names = "hs_phy_irq",
+                                         "ss_phy_irq",
+                                         "dm_hs_phy_irq",
+                                         "dp_hs_phy_irq";
+
+                       power-domains = <&gcc USB30_PRIM_GDSC>;
+
+                       resets = <&gcc GCC_USB30_PRIM_BCR>;
+
+                       usb_1_dwc3: usb@a600000 {
+                               compatible = "snps,dwc3";
+                               reg = <0 0x0a600000 0 0xcd00>;
+                               interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
+                               iommus = <&apps_smmu 0x0 0x0>;
+                               snps,dis_u2_susphy_quirk;
+                               snps,dis_enblslpm_quirk;
+                               phys = <&usb_1_hsphy>, <&usb_1_ssphy>;
+                               phy-names = "usb2-phy", "usb3-phy";
+                       };
+               };
+
+               nsp_noc: interconnect@320c0000 {
+                       compatible = "qcom,sm8450-nsp-noc";
+                       reg = <0 0x320c0000 0 0x10000>;
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
+
+               lpass_ag_noc: interconnect@3c40000 {
+                       compatible = "qcom,sm8450-lpass-ag-noc";
+                       reg = <0 0x3c40000 0 0x17200>;
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
+       };
+
+       thermal-zones {
+               aoss0-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens0 0>;
+
+                       trips {
+                               thermal-engine-config {
+                                       temperature = <125000>;
+                                       hysteresis = <1000>;
+                                       type = "passive";
+                               };
+
+                               reset-mon-cfg {
+                                       temperature = <115000>;
+                                       hysteresis = <5000>;
+                                       type = "passive";
+                               };
+                       };
+               };
+
+               cpuss0-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens0 1>;
+
+                       trips {
+                               thermal-engine-config {
+                                       temperature = <125000>;
+                                       hysteresis = <1000>;
+                                       type = "passive";
+                               };
+
+                               reset-mon-cfg {
+                                       temperature = <115000>;
+                                       hysteresis = <5000>;
+                                       type = "passive";
+                               };
+                       };
+               };
+
+               cpuss1-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens0 2>;
+
+                       trips {
+                               thermal-engine-config {
+                                       temperature = <125000>;
+                                       hysteresis = <1000>;
+                                       type = "passive";
+                               };
+
+                               reset-mon-cfg {
+                                       temperature = <115000>;
+                                       hysteresis = <5000>;
+                                       type = "passive";
+                               };
+                       };
+               };
+
+               cpuss3-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens0 3>;
+
+                       trips {
+                               thermal-engine-config {
+                                       temperature = <125000>;
+                                       hysteresis = <1000>;
+                                       type = "passive";
+                               };
+
+                               reset-mon-cfg {
+                                       temperature = <115000>;
+                                       hysteresis = <5000>;
+                                       type = "passive";
+                               };
+                       };
+               };
+
+               cpuss4-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens0 4>;
+
+                       trips {
+                               thermal-engine-config {
+                                       temperature = <125000>;
+                                       hysteresis = <1000>;
+                                       type = "passive";
+                               };
+
+                               reset-mon-cfg {
+                                       temperature = <115000>;
+                                       hysteresis = <5000>;
+                                       type = "passive";
+                               };
+                       };
+               };
+
+               cpu4-top-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens0 5>;
+
+                       trips {
+                               cpu4_top_alert0: trip-point0 {
+                                       temperature = <90000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+
+                               cpu4_top_alert1: trip-point1 {
+                                       temperature = <95000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+
+                               cpu4_top_crit: cpu_crit {
+                                       temperature = <110000>;
+                                       hysteresis = <1000>;
+                                       type = "critical";
+                               };
+                       };
+               };
+
+               cpu4-bottom-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens0 6>;
+
+                       trips {
+                               cpu4_bottom_alert0: trip-point0 {
+                                       temperature = <90000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+
+                               cpu4_bottom_alert1: trip-point1 {
+                                       temperature = <95000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+
+                               cpu4_bottom_crit: cpu_crit {
+                                       temperature = <110000>;
+                                       hysteresis = <1000>;
+                                       type = "critical";
+                               };
+                       };
+               };
+
+               cpu5-top-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens0 7>;
+
+                       trips {
+                               cpu5_top_alert0: trip-point0 {
+                                       temperature = <90000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+
+                               cpu5_top_alert1: trip-point1 {
+                                       temperature = <95000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+
+                               cpu5_top_crit: cpu_crit {
+                                       temperature = <110000>;
+                                       hysteresis = <1000>;
+                                       type = "critical";
+                               };
+                       };
+               };
+
+               cpu5-bottom-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens0 8>;
+
+                       trips {
+                               cpu5_bottom_alert0: trip-point0 {
+                                       temperature = <90000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+
+                               cpu5_bottom_alert1: trip-point1 {
+                                       temperature = <95000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+
+                               cpu5_bottom_crit: cpu_crit {
+                                       temperature = <110000>;
+                                       hysteresis = <1000>;
+                                       type = "critical";
+                               };
+                       };
+               };
+
+               cpu6-top-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens0 9>;
+
+                       trips {
+                               cpu6_top_alert0: trip-point0 {
+                                       temperature = <90000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+
+                               cpu6_top_alert1: trip-point1 {
+                                       temperature = <95000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+
+                               cpu6_top_crit: cpu_crit {
+                                       temperature = <110000>;
+                                       hysteresis = <1000>;
+                                       type = "critical";
+                               };
+                       };
+               };
+
+               cpu6-bottom-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens0 10>;
+
+                       trips {
+                               cpu6_bottom_alert0: trip-point0 {
+                                       temperature = <90000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+
+                               cpu6_bottom_alert1: trip-point1 {
+                                       temperature = <95000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+
+                               cpu6_bottom_crit: cpu_crit {
+                                       temperature = <110000>;
+                                       hysteresis = <1000>;
+                                       type = "critical";
+                               };
+                       };
+               };
+
+               cpu7-top-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens0 11>;
+
+                       trips {
+                               cpu7_top_alert0: trip-point0 {
+                                       temperature = <90000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+
+                               cpu7_top_alert1: trip-point1 {
+                                       temperature = <95000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+
+                               cpu7_top_crit: cpu_crit {
+                                       temperature = <110000>;
+                                       hysteresis = <1000>;
+                                       type = "critical";
+                               };
+                       };
+               };
+
+               cpu7-middle-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens0 12>;
+
+                       trips {
+                               cpu7_middle_alert0: trip-point0 {
+                                       temperature = <90000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+
+                               cpu7_middle_alert1: trip-point1 {
+                                       temperature = <95000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+
+                               cpu7_middle_crit: cpu_crit {
+                                       temperature = <110000>;
+                                       hysteresis = <1000>;
+                                       type = "critical";
+                               };
+                       };
+               };
+
+               cpu7-bottom-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens0 13>;
+
+                       trips {
+                               cpu7_bottom_alert0: trip-point0 {
+                                       temperature = <90000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+
+                               cpu7_bottom_alert1: trip-point1 {
+                                       temperature = <95000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+
+                               cpu7_bottom_crit: cpu_crit {
+                                       temperature = <110000>;
+                                       hysteresis = <1000>;
+                                       type = "critical";
+                               };
                        };
                };
 
-               pdc: interrupt-controller@b220000 {
-                       compatible = "qcom,sm8450-pdc", "qcom,pdc";
-                       reg = <0 0x0b220000 0 0x30000>, <0 0x174000f0 0 0x64>;
-                       qcom,pdc-ranges = <0 480 12>, <14 494 24>, <40 520 54>,
-                                         <94 609 31>, <125 63 1>, <126 716 12>;
-                       #interrupt-cells = <2>;
-                       interrupt-parent = <&intc>;
-                       interrupt-controller;
-               };
+               gpu-top-thermal {
+                       polling-delay-passive = <10>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens0 14>;
 
-               aoss_qmp: power-controller@c300000 {
-                       compatible = "qcom,sm8450-aoss-qmp", "qcom,aoss-qmp";
-                       reg = <0 0x0c300000 0 0x400>;
-                       interrupts-extended = <&ipcc IPCC_CLIENT_AOP IPCC_MPROC_SIGNAL_GLINK_QMP
-                                                    IRQ_TYPE_EDGE_RISING>;
-                       mboxes = <&ipcc IPCC_CLIENT_AOP IPCC_MPROC_SIGNAL_GLINK_QMP>;
+                       trips {
+                               thermal-engine-config {
+                                       temperature = <125000>;
+                                       hysteresis = <1000>;
+                                       type = "passive";
+                               };
 
-                       #clock-cells = <0>;
-               };
+                               thermal-hal-config {
+                                       temperature = <125000>;
+                                       hysteresis = <1000>;
+                                       type = "passive";
+                               };
 
-               ipcc: mailbox@ed18000 {
-                       compatible = "qcom,sm8450-ipcc", "qcom,ipcc";
-                       reg = <0 0x0ed18000 0 0x1000>;
-                       interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-controller;
-                       #interrupt-cells = <3>;
-                       #mbox-cells = <2>;
+                               reset-mon-cfg {
+                                       temperature = <115000>;
+                                       hysteresis = <5000>;
+                                       type = "passive";
+                               };
+
+                               gpu0_tj_cfg: tj_cfg {
+                                       temperature = <95000>;
+                                       hysteresis = <5000>;
+                                       type = "passive";
+                               };
+                       };
                };
 
-               tlmm: pinctrl@f100000 {
-                       compatible = "qcom,sm8450-tlmm";
-                       reg = <0 0x0f100000 0 0x300000>;
-                       interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-                       gpio-ranges = <&tlmm 0 0 211>;
-                       wakeup-parent = <&pdc>;
+               gpu-bottom-thermal {
+                       polling-delay-passive = <10>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens0 15>;
 
-                       qup_i2c13_data_clk: qup-i2c13-data-clk {
-                               pins = "gpio48", "gpio49";
-                               function = "qup13";
-                               drive-strength = <2>;
-                               bias-pull-up;
-                       };
+                       trips {
+                               thermal-engine-config {
+                                       temperature = <125000>;
+                                       hysteresis = <1000>;
+                                       type = "passive";
+                               };
 
-                       qup_i2c14_data_clk: qup-i2c14-data-clk {
-                               pins = "gpio52", "gpio53";
-                               function = "qup14";
-                               drive-strength = <2>;
-                               bias-pull-up;
-                       };
+                               thermal-hal-config {
+                                       temperature = <125000>;
+                                       hysteresis = <1000>;
+                                       type = "passive";
+                               };
 
-                       qup_uart7_rx: qup-uart7-rx {
-                               pins = "gpio26";
-                               function = "qup7";
-                               drive-strength = <2>;
-                               bias-disable;
-                       };
+                               reset-mon-cfg {
+                                       temperature = <115000>;
+                                       hysteresis = <5000>;
+                                       type = "passive";
+                               };
 
-                       qup_uart7_tx: qup-uart7-tx {
-                               pins = "gpio27";
-                               function = "qup7";
-                               drive-strength = <2>;
-                               bias-disable;
+                               gpu1_tj_cfg: tj_cfg {
+                                       temperature = <95000>;
+                                       hysteresis = <5000>;
+                                       type = "passive";
+                               };
                        };
                };
 
-               apps_smmu: iommu@15000000 {
-                       compatible = "qcom,sm8450-smmu-500", "arm,mmu-500";
-                       reg = <0 0x15000000 0 0x100000>;
-                       #iommu-cells = <2>;
-                       #global-interrupts = <1>;
-                       interrupts =    <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 181 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 185 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 395 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 396 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 397 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 398 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 399 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 400 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 401 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 402 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 403 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 404 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 405 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 406 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 407 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 408 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 409 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 412 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 707 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 690 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 691 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 692 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 693 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 694 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 695 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 696 IRQ_TYPE_LEVEL_HIGH>,
-                                       <GIC_SPI 697 IRQ_TYPE_LEVEL_HIGH>;
-               };
+               aoss1-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens1 0>;
 
-               intc: interrupt-controller@17100000 {
-                       compatible = "arm,gic-v3";
-                       #interrupt-cells = <3>;
-                       interrupt-controller;
-                       #redistributor-regions = <1>;
-                       redistributor-stride = <0x0 0x40000>;
-                       reg = <0x0 0x17100000 0x0 0x10000>,     /* GICD */
-                             <0x0 0x17180000 0x0 0x200000>;    /* GICR * 8 */
-                       interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
+                       trips {
+                               thermal-engine-config {
+                                       temperature = <125000>;
+                                       hysteresis = <1000>;
+                                       type = "passive";
+                               };
+
+                               reset-mon-cfg {
+                                       temperature = <115000>;
+                                       hysteresis = <5000>;
+                                       type = "passive";
+                               };
+                       };
                };
 
-               timer@17420000 {
-                       compatible = "arm,armv7-timer-mem";
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges;
-                       reg = <0x0 0x17420000 0x0 0x1000>;
-                       clock-frequency = <19200000>;
+               cpu0-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens1 1>;
 
-                       frame@17421000 {
-                               frame-number = <0>;
-                               interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
-                                            <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
-                               reg = <0x0 0x17421000 0x0 0x1000>,
-                                     <0x0 0x17422000 0x0 0x1000>;
-                       };
+                       trips {
+                               cpu0_alert0: trip-point0 {
+                                       temperature = <90000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
 
-                       frame@17423000 {
-                               frame-number = <1>;
-                               interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
-                               reg = <0x0 0x17423000 0x0 0x1000>;
-                               status = "disabled";
-                       };
+                               cpu0_alert1: trip-point1 {
+                                       temperature = <95000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
 
-                       frame@17425000 {
-                               frame-number = <2>;
-                               interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
-                               reg = <0x0 0x17425000 0x0 0x1000>;
-                               status = "disabled";
+                               cpu0_crit: cpu_crit {
+                                       temperature = <110000>;
+                                       hysteresis = <1000>;
+                                       type = "critical";
+                               };
                        };
+               };
 
-                       frame@17427000 {
-                               frame-number = <3>;
-                               interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
-                               reg = <0x0 0x17427000 0x0 0x1000>;
-                               status = "disabled";
-                       };
+               cpu1-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens1 2>;
 
-                       frame@17429000 {
-                               frame-number = <4>;
-                               interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
-                               reg = <0x0 0x17429000 0x0 0x1000>;
-                               status = "disabled";
-                       };
+                       trips {
+                               cpu1_alert0: trip-point0 {
+                                       temperature = <90000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
 
-                       frame@1742b000 {
-                               frame-number = <5>;
-                               interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
-                               reg = <0x0 0x1742b000 0x0 0x1000>;
-                               status = "disabled";
-                       };
+                               cpu1_alert1: trip-point1 {
+                                       temperature = <95000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
 
-                       frame@1742d000 {
-                               frame-number = <6>;
-                               interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
-                               reg = <0x0 0x1742d000 0x0 0x1000>;
-                               status = "disabled";
+                               cpu1_crit: cpu_crit {
+                                       temperature = <110000>;
+                                       hysteresis = <1000>;
+                                       type = "critical";
+                               };
                        };
                };
 
-               apps_rsc: rsc@17a00000 {
-                       label = "apps_rsc";
-                       compatible = "qcom,rpmh-rsc";
-                       reg = <0x0 0x17a00000 0x0 0x10000>,
-                             <0x0 0x17a10000 0x0 0x10000>,
-                             <0x0 0x17a20000 0x0 0x10000>,
-                             <0x0 0x17a30000 0x0 0x10000>;
-                       reg-names = "drv-0", "drv-1", "drv-2", "drv-3";
-                       interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
-                       qcom,tcs-offset = <0xd00>;
-                       qcom,drv-id = <2>;
-                       qcom,tcs-config = <ACTIVE_TCS  3>, <SLEEP_TCS   2>,
-                                         <WAKE_TCS    2>, <CONTROL_TCS 0>;
+               cpu2-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens1 3>;
+
+                       trips {
+                               cpu2_alert0: trip-point0 {
+                                       temperature = <90000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+
+                               cpu2_alert1: trip-point1 {
+                                       temperature = <95000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
 
-                       apps_bcm_voter: bcm-voter {
-                               compatible = "qcom,bcm-voter";
+                               cpu2_crit: cpu_crit {
+                                       temperature = <110000>;
+                                       hysteresis = <1000>;
+                                       type = "critical";
+                               };
                        };
+               };
 
-                       rpmhcc: clock-controller {
-                               compatible = "qcom,sm8450-rpmh-clk";
-                               #clock-cells = <1>;
-                               clock-names = "xo";
-                               clocks = <&xo_board>;
-                       };
+               cpu3-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens1 4>;
 
-                       rpmhpd: power-controller {
-                               compatible = "qcom,sm8450-rpmhpd";
-                               #power-domain-cells = <1>;
-                               operating-points-v2 = <&rpmhpd_opp_table>;
+                       trips {
+                               cpu3_alert0: trip-point0 {
+                                       temperature = <90000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
 
-                               rpmhpd_opp_table: opp-table {
-                                       compatible = "operating-points-v2";
+                               cpu3_alert1: trip-point1 {
+                                       temperature = <95000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
 
-                                       rpmhpd_opp_ret: opp1 {
-                                               opp-level = <RPMH_REGULATOR_LEVEL_RETENTION>;
-                                       };
+                               cpu3_crit: cpu_crit {
+                                       temperature = <110000>;
+                                       hysteresis = <1000>;
+                                       type = "critical";
+                               };
+                       };
+               };
 
-                                       rpmhpd_opp_min_svs: opp2 {
-                                               opp-level = <RPMH_REGULATOR_LEVEL_MIN_SVS>;
-                                       };
+               cdsp0-thermal {
+                       polling-delay-passive = <10>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens1 5>;
 
-                                       rpmhpd_opp_low_svs: opp3 {
-                                               opp-level = <RPMH_REGULATOR_LEVEL_LOW_SVS>;
-                                       };
+                       trips {
+                               thermal-engine-config {
+                                       temperature = <125000>;
+                                       hysteresis = <1000>;
+                                       type = "passive";
+                               };
 
-                                       rpmhpd_opp_svs: opp4 {
-                                               opp-level = <RPMH_REGULATOR_LEVEL_SVS>;
-                                       };
+                               thermal-hal-config {
+                                       temperature = <125000>;
+                                       hysteresis = <1000>;
+                                       type = "passive";
+                               };
 
-                                       rpmhpd_opp_svs_l1: opp5 {
-                                               opp-level = <RPMH_REGULATOR_LEVEL_SVS_L1>;
-                                       };
+                               reset-mon-cfg {
+                                       temperature = <115000>;
+                                       hysteresis = <5000>;
+                                       type = "passive";
+                               };
 
-                                       rpmhpd_opp_nom: opp6 {
-                                               opp-level = <RPMH_REGULATOR_LEVEL_NOM>;
-                                       };
+                               cdsp_0_config: junction-config {
+                                       temperature = <95000>;
+                                       hysteresis = <5000>;
+                                       type = "passive";
+                               };
+                       };
+               };
 
-                                       rpmhpd_opp_nom_l1: opp7 {
-                                               opp-level = <RPMH_REGULATOR_LEVEL_NOM_L1>;
-                                       };
+               cdsp1-thermal {
+                       polling-delay-passive = <10>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens1 6>;
 
-                                       rpmhpd_opp_nom_l2: opp8 {
-                                               opp-level = <RPMH_REGULATOR_LEVEL_NOM_L2>;
-                                       };
+                       trips {
+                               thermal-engine-config {
+                                       temperature = <125000>;
+                                       hysteresis = <1000>;
+                                       type = "passive";
+                               };
 
-                                       rpmhpd_opp_turbo: opp9 {
-                                               opp-level = <RPMH_REGULATOR_LEVEL_TURBO>;
-                                       };
+                               thermal-hal-config {
+                                       temperature = <125000>;
+                                       hysteresis = <1000>;
+                                       type = "passive";
+                               };
 
-                                       rpmhpd_opp_turbo_l1: opp10 {
-                                               opp-level = <RPMH_REGULATOR_LEVEL_TURBO_L1>;
-                                       };
+                               reset-mon-cfg {
+                                       temperature = <115000>;
+                                       hysteresis = <5000>;
+                                       type = "passive";
+                               };
+
+                               cdsp_1_config: junction-config {
+                                       temperature = <95000>;
+                                       hysteresis = <5000>;
+                                       type = "passive";
                                };
                        };
                };
 
-               cpufreq_hw: cpufreq@17d91000 {
-                       compatible = "qcom,sm8450-cpufreq-epss", "qcom,cpufreq-epss";
-                       reg = <0 0x17d91000 0 0x1000>,
-                             <0 0x17d92000 0 0x1000>,
-                             <0 0x17d93000 0 0x1000>;
-                       reg-names = "freq-domain0", "freq-domain1", "freq-domain2";
-                       clocks = <&rpmhcc RPMH_CXO_CLK>, <&gcc GCC_GPLL0>;
-                       clock-names = "xo", "alternate";
-                       interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-names = "dcvsh-irq-0", "dcvsh-irq-1", "dcvsh-irq-2";
-                       #freq-domain-cells = <1>;
+               cdsp2-thermal {
+                       polling-delay-passive = <10>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens1 7>;
+
+                       trips {
+                               thermal-engine-config {
+                                       temperature = <125000>;
+                                       hysteresis = <1000>;
+                                       type = "passive";
+                               };
+
+                               thermal-hal-config {
+                                       temperature = <125000>;
+                                       hysteresis = <1000>;
+                                       type = "passive";
+                               };
+
+                               reset-mon-cfg {
+                                       temperature = <115000>;
+                                       hysteresis = <5000>;
+                                       type = "passive";
+                               };
+
+                               cdsp_2_config: junction-config {
+                                       temperature = <95000>;
+                                       hysteresis = <5000>;
+                                       type = "passive";
+                               };
+                       };
                };
 
-               gem_noc: interconnect@19100000 {
-                       compatible = "qcom,sm8450-gem-noc";
-                       reg = <0 0x19100000 0 0xbb800>;
-                       #interconnect-cells = <2>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
+               video-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens1 8>;
+
+                       trips {
+                               thermal-engine-config {
+                                       temperature = <125000>;
+                                       hysteresis = <1000>;
+                                       type = "passive";
+                               };
+
+                               reset-mon-cfg {
+                                       temperature = <115000>;
+                                       hysteresis = <5000>;
+                                       type = "passive";
+                               };
+                       };
                };
 
-               system-cache-controller@19200000 {
-                       compatible = "qcom,sm8450-llcc";
-                       reg = <0 0x19200000 0 0x580000>, <0 0x19a00000 0 0x80000>;
-                       reg-names = "llcc_base", "llcc_broadcast_base";
-                       interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>;
+               mem-thermal {
+                       polling-delay-passive = <10>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens1 9>;
+
+                       trips {
+                               thermal-engine-config {
+                                       temperature = <125000>;
+                                       hysteresis = <1000>;
+                                       type = "passive";
+                               };
+
+                               ddr_config0: ddr0-config {
+                                       temperature = <90000>;
+                                       hysteresis = <5000>;
+                                       type = "passive";
+                               };
+
+                               reset-mon-cfg {
+                                       temperature = <115000>;
+                                       hysteresis = <5000>;
+                                       type = "passive";
+                               };
+                       };
                };
 
-               ufs_mem_hc: ufshc@1d84000 {
-                       compatible = "qcom,sm8450-ufshc", "qcom,ufshc",
-                                    "jedec,ufs-2.0";
-                       reg = <0 0x01d84000 0 0x3000>;
-                       interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>;
-                       phys = <&ufs_mem_phy_lanes>;
-                       phy-names = "ufsphy";
-                       lanes-per-direction = <2>;
-                       #reset-cells = <1>;
-                       resets = <&gcc GCC_UFS_PHY_BCR>;
-                       reset-names = "rst";
+               modem0-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens1 10>;
 
-                       power-domains = <&gcc UFS_PHY_GDSC>;
+                       trips {
+                               thermal-engine-config {
+                                       temperature = <125000>;
+                                       hysteresis = <1000>;
+                                       type = "passive";
+                               };
 
-                       iommus = <&apps_smmu 0xe0 0x0>;
+                               mdmss0_config0: mdmss0-config0 {
+                                       temperature = <102000>;
+                                       hysteresis = <3000>;
+                                       type = "passive";
+                               };
 
-                       interconnects = <&aggre1_noc MASTER_UFS_MEM &mc_virt SLAVE_EBI1>,
-                                       <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_UFS_MEM_CFG>;
-                       interconnect-names = "ufs-ddr", "cpu-ufs";
-                       clock-names =
-                               "core_clk",
-                               "bus_aggr_clk",
-                               "iface_clk",
-                               "core_clk_unipro",
-                               "ref_clk",
-                               "tx_lane0_sync_clk",
-                               "rx_lane0_sync_clk",
-                               "rx_lane1_sync_clk";
-                       clocks =
-                               <&gcc GCC_UFS_PHY_AXI_CLK>,
-                               <&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>,
-                               <&gcc GCC_UFS_PHY_AHB_CLK>,
-                               <&gcc GCC_UFS_PHY_UNIPRO_CORE_CLK>,
-                               <&rpmhcc RPMH_CXO_CLK>,
-                               <&gcc GCC_UFS_PHY_TX_SYMBOL_0_CLK>,
-                               <&gcc GCC_UFS_PHY_RX_SYMBOL_0_CLK>,
-                               <&gcc GCC_UFS_PHY_RX_SYMBOL_1_CLK>;
-                       freq-table-hz =
-                               <75000000 300000000>,
-                               <0 0>,
-                               <0 0>,
-                               <75000000 300000000>,
-                               <75000000 300000000>,
-                               <0 0>,
-                               <0 0>,
-                               <0 0>;
-                       status = "disabled";
+                               mdmss0_config1: mdmss0-config1 {
+                                       temperature = <105000>;
+                                       hysteresis = <3000>;
+                                       type = "passive";
+                               };
+
+                               reset-mon-cfg {
+                                       temperature = <115000>;
+                                       hysteresis = <5000>;
+                                       type = "passive";
+                               };
+                       };
                };
 
-               ufs_mem_phy: phy@1d87000 {
-                       compatible = "qcom,sm8450-qmp-ufs-phy";
-                       reg = <0 0x01d87000 0 0xe10>;
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges;
-                       clock-names = "ref", "ref_aux", "qref";
-                       clocks = <&rpmhcc RPMH_CXO_CLK>,
-                                <&gcc GCC_UFS_PHY_PHY_AUX_CLK>,
-                                <&gcc GCC_UFS_0_CLKREF_EN>;
+               modem1-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens1 11>;
 
-                       resets = <&ufs_mem_hc 0>;
-                       reset-names = "ufsphy";
-                       status = "disabled";
+                       trips {
+                               thermal-engine-config {
+                                       temperature = <125000>;
+                                       hysteresis = <1000>;
+                                       type = "passive";
+                               };
 
-                       ufs_mem_phy_lanes: lanes@1d87400 {
-                               reg = <0 0x01d87400 0 0x108>,
-                                     <0 0x01d87600 0 0x1e0>,
-                                     <0 0x01d87c00 0 0x1dc>,
-                                     <0 0x01d87800 0 0x108>,
-                                     <0 0x01d87a00 0 0x1e0>;
-                               #phy-cells = <0>;
-                               #clock-cells = <0>;
+                               mdmss1_config0: mdmss1-config0 {
+                                       temperature = <102000>;
+                                       hysteresis = <3000>;
+                                       type = "passive";
+                               };
+
+                               mdmss1_config1: mdmss1-config1 {
+                                       temperature = <105000>;
+                                       hysteresis = <3000>;
+                                       type = "passive";
+                               };
+
+                               reset-mon-cfg {
+                                       temperature = <115000>;
+                                       hysteresis = <5000>;
+                                       type = "passive";
+                               };
                        };
                };
 
-               usb_1: usb@a6f8800 {
-                       compatible = "qcom,sm8450-dwc3", "qcom,dwc3";
-                       reg = <0 0x0a6f8800 0 0x400>;
-                       status = "disabled";
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges;
+               modem2-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens1 12>;
 
-                       clocks = <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>,
-                                <&gcc GCC_USB30_PRIM_MASTER_CLK>,
-                                <&gcc GCC_AGGRE_USB3_PRIM_AXI_CLK>,
-                                <&gcc GCC_USB30_PRIM_SLEEP_CLK>,
-                                <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>,
-                                <&gcc GCC_USB3_0_CLKREF_EN>;
-                       clock-names = "cfg_noc",
-                                     "core",
-                                     "iface",
-                                     "sleep",
-                                     "mock_utmi",
-                                     "xo";
+                       trips {
+                               thermal-engine-config {
+                                       temperature = <125000>;
+                                       hysteresis = <1000>;
+                                       type = "passive";
+                               };
 
-                       assigned-clocks = <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>,
-                                         <&gcc GCC_USB30_PRIM_MASTER_CLK>;
-                       assigned-clock-rates = <19200000>, <200000000>;
+                               mdmss2_config0: mdmss2-config0 {
+                                       temperature = <102000>;
+                                       hysteresis = <3000>;
+                                       type = "passive";
+                               };
 
-                       interrupts-extended = <&intc GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>,
-                                             <&pdc 17 IRQ_TYPE_LEVEL_HIGH>,
-                                             <&pdc 15 IRQ_TYPE_EDGE_BOTH>,
-                                             <&pdc 14 IRQ_TYPE_EDGE_BOTH>;
-                       interrupt-names = "hs_phy_irq",
-                                         "ss_phy_irq",
-                                         "dm_hs_phy_irq",
-                                         "dp_hs_phy_irq";
+                               mdmss2_config1: mdmss2-config1 {
+                                       temperature = <105000>;
+                                       hysteresis = <3000>;
+                                       type = "passive";
+                               };
 
-                       power-domains = <&gcc USB30_PRIM_GDSC>;
+                               reset-mon-cfg {
+                                       temperature = <115000>;
+                                       hysteresis = <5000>;
+                                       type = "passive";
+                               };
+                       };
+               };
 
-                       resets = <&gcc GCC_USB30_PRIM_BCR>;
+               modem3-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens1 13>;
 
-                       usb_1_dwc3: usb@a600000 {
-                               compatible = "snps,dwc3";
-                               reg = <0 0x0a600000 0 0xcd00>;
-                               interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
-                               iommus = <&apps_smmu 0x0 0x0>;
-                               snps,dis_u2_susphy_quirk;
-                               snps,dis_enblslpm_quirk;
-                               phys = <&usb_1_hsphy>, <&usb_1_ssphy>;
-                               phy-names = "usb2-phy", "usb3-phy";
+                       trips {
+                               thermal-engine-config {
+                                       temperature = <125000>;
+                                       hysteresis = <1000>;
+                                       type = "passive";
+                               };
+
+                               mdmss3_config0: mdmss3-config0 {
+                                       temperature = <102000>;
+                                       hysteresis = <3000>;
+                                       type = "passive";
+                               };
+
+                               mdmss3_config1: mdmss3-config1 {
+                                       temperature = <105000>;
+                                       hysteresis = <3000>;
+                                       type = "passive";
+                               };
+
+                               reset-mon-cfg {
+                                       temperature = <115000>;
+                                       hysteresis = <5000>;
+                                       type = "passive";
+                               };
                        };
                };
 
-               nsp_noc: interconnect@320c0000 {
-                       compatible = "qcom,sm8450-nsp-noc";
-                       reg = <0 0x320c0000 0 0x10000>;
-                       #interconnect-cells = <2>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
+               camera0-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens1 14>;
+
+                       trips {
+                               thermal-engine-config {
+                                       temperature = <125000>;
+                                       hysteresis = <1000>;
+                                       type = "passive";
+                               };
+
+                               reset-mon-cfg {
+                                       temperature = <115000>;
+                                       hysteresis = <5000>;
+                                       type = "passive";
+                               };
+                       };
                };
 
-               lpass_ag_noc: interconnect@3c40000 {
-                       compatible = "qcom,sm8450-lpass-ag-noc";
-                       reg = <0 0x3c40000 0 0x17200>;
-                       #interconnect-cells = <2>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
+               camera1-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&tsens1 15>;
+
+                       trips {
+                               thermal-engine-config {
+                                       temperature = <125000>;
+                                       hysteresis = <1000>;
+                                       type = "passive";
+                               };
+
+                               reset-mon-cfg {
+                                       temperature = <115000>;
+                                       hysteresis = <5000>;
+                                       type = "passive";
+                               };
+                       };
                };
        };