Merge tag 'dt-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[platform/kernel/linux-starfive.git] / arch / arm64 / boot / dts / qcom / sc7280.dtsi
index fd78f16..365a2e0 100644 (file)
@@ -5,12 +5,14 @@
  * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
  */
 
+#include <dt-bindings/clock/qcom,dispcc-sc7280.h>
 #include <dt-bindings/clock/qcom,gcc-sc7280.h>
+#include <dt-bindings/clock/qcom,gpucc-sc7280.h>
 #include <dt-bindings/clock/qcom,rpmh.h>
+#include <dt-bindings/clock/qcom,videocc-sc7280.h>
 #include <dt-bindings/interconnect/qcom,sc7280.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/mailbox/qcom-ipcc.h>
-#include <dt-bindings/power/qcom-aoss-qmp.h>
 #include <dt-bindings/power/qcom-rpmpd.h>
 #include <dt-bindings/reset/qcom,sdm845-aoss.h>
 #include <dt-bindings/reset/qcom,sdm845-pdc.h>
        chosen { };
 
        aliases {
+               i2c0 = &i2c0;
+               i2c1 = &i2c1;
+               i2c2 = &i2c2;
+               i2c3 = &i2c3;
+               i2c4 = &i2c4;
+               i2c5 = &i2c5;
+               i2c6 = &i2c6;
+               i2c7 = &i2c7;
+               i2c8 = &i2c8;
+               i2c9 = &i2c9;
+               i2c10 = &i2c10;
+               i2c11 = &i2c11;
+               i2c12 = &i2c12;
+               i2c13 = &i2c13;
+               i2c14 = &i2c14;
+               i2c15 = &i2c15;
                mmc1 = &sdhc_1;
                mmc2 = &sdhc_2;
+               spi0 = &spi0;
+               spi1 = &spi1;
+               spi2 = &spi2;
+               spi3 = &spi3;
+               spi4 = &spi4;
+               spi5 = &spi5;
+               spi6 = &spi6;
+               spi7 = &spi7;
+               spi8 = &spi8;
+               spi9 = &spi9;
+               spi10 = &spi10;
+               spi11 = &spi11;
+               spi12 = &spi12;
+               spi13 = &spi13;
+               spi14 = &spi14;
+               spi15 = &spi15;
        };
 
        clocks {
                #size-cells = <2>;
                ranges;
 
+               hyp_mem: memory@80000000 {
+                       reg = <0x0 0x80000000 0x0 0x600000>;
+                       no-map;
+               };
+
+               xbl_mem: memory@80600000 {
+                       reg = <0x0 0x80600000 0x0 0x200000>;
+                       no-map;
+               };
+
                aop_mem: memory@80800000 {
                        reg = <0x0 0x80800000 0x0 0x60000>;
                        no-map;
                        no-map;
                };
 
+               reserved_xbl_uefi_log: memory@80880000 {
+                       reg = <0x0 0x80884000 0x0 0x10000>;
+                       no-map;
+               };
+
+               sec_apps_mem: memory@808ff000 {
+                       reg = <0x0 0x808ff000 0x0 0x1000>;
+                       no-map;
+               };
+
                smem_mem: memory@80900000 {
                        reg = <0x0 0x80900000 0x0 0x200000>;
                        no-map;
                        reg = <0x0 0x80b00000 0x0 0x100000>;
                };
 
+               wlan_fw_mem: memory@80c00000 {
+                       reg = <0x0 0x80c00000 0x0 0xc00000>;
+                       no-map;
+               };
+
                ipa_fw_mem: memory@8b700000 {
                        reg = <0 0x8b700000 0 0x10000>;
                        no-map;
                };
+
+               rmtfs_mem: memory@9c900000 {
+                       compatible = "qcom,rmtfs-mem";
+                       reg = <0x0 0x9c900000 0x0 0x280000>;
+                       no-map;
+
+                       qcom,client-id = <1>;
+                       qcom,vmid = <15>;
+               };
        };
 
        cpus {
                        };
                };
 
+               cpu-map {
+                       cluster0 {
+                               core0 {
+                                       cpu = <&CPU0>;
+                               };
+
+                               core1 {
+                                       cpu = <&CPU1>;
+                               };
+
+                               core2 {
+                                       cpu = <&CPU2>;
+                               };
+
+                               core3 {
+                                       cpu = <&CPU3>;
+                               };
+
+                               core4 {
+                                       cpu = <&CPU4>;
+                               };
+
+                               core5 {
+                                       cpu = <&CPU5>;
+                               };
+
+                               core6 {
+                                       cpu = <&CPU6>;
+                               };
+
+                               core7 {
+                                       cpu = <&CPU7>;
+                               };
+                       };
+               };
+
                idle-states {
                        entry-method = "psci";
 
                method = "smc";
        };
 
+       qspi_opp_table: qspi-opp-table {
+               compatible = "operating-points-v2";
+
+               opp-75000000 {
+                       opp-hz = /bits/ 64 <75000000>;
+                       required-opps = <&rpmhpd_opp_low_svs>;
+               };
+
+               opp-150000000 {
+                       opp-hz = /bits/ 64 <150000000>;
+                       required-opps = <&rpmhpd_opp_svs>;
+               };
+
+               opp-200000000 {
+                       opp-hz = /bits/ 64 <200000000>;
+                       required-opps = <&rpmhpd_opp_svs_l1>;
+               };
+
+               opp-300000000 {
+                       opp-hz = /bits/ 64 <300000000>;
+                       required-opps = <&rpmhpd_opp_nom>;
+               };
+       };
+
+       qup_opp_table: qup-opp-table {
+               compatible = "operating-points-v2";
+
+               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>;
+               };
+
+               opp-128000000 {
+                       opp-hz = /bits/ 64 <128000000>;
+                       required-opps = <&rpmhpd_opp_nom>;
+               };
+       };
+
        soc: soc@0 {
                #address-cells = <2>;
                #size-cells = <2>;
                qupv3_id_0: geniqup@9c0000 {
                        compatible = "qcom,geni-se-qup";
                        reg = <0 0x009c0000 0 0x2000>;
-                       clock-names = "m-ahb", "s-ahb";
                        clocks = <&gcc GCC_QUPV3_WRAP_0_M_AHB_CLK>,
                                 <&gcc GCC_QUPV3_WRAP_0_S_AHB_CLK>;
+                       clock-names = "m-ahb", "s-ahb";
                        #address-cells = <2>;
                        #size-cells = <2>;
                        ranges;
+                       iommus = <&apps_smmu 0x123 0x0>;
                        status = "disabled";
 
-                       uart5: serial@994000 {
-                               compatible = "qcom,geni-debug-uart";
-                               reg = <0 0x00994000 0 0x4000>;
+                       i2c0: i2c@980000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0 0x00980000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S0_CLK>;
                                clock-names = "se";
-                               clocks = <&gcc GCC_QUPV3_WRAP0_S5_CLK>;
                                pinctrl-names = "default";
-                               pinctrl-0 = <&qup_uart5_default>;
-                               interrupts = <GIC_SPI 606 IRQ_TYPE_LEVEL_HIGH>;
+                               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>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_0 0>,
+                                               <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config",
+                                                       "qup-memory";
                                status = "disabled";
                        };
-               };
 
-               cnoc2: interconnect@1500000 {
-                       reg = <0 0x01500000 0 0x1000>;
-                       compatible = "qcom,sc7280-cnoc2";
-                       #interconnect-cells = <2>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
-               };
+                       spi0: spi@980000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0 0x00980000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S0_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi0_data_clk>, <&qup_spi0_cs>;
+                               interrupts = <GIC_SPI 601 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_0 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
+                       };
 
-               cnoc3: interconnect@1502000 {
-                       reg = <0 0x01502000 0 0x1000>;
-                       compatible = "qcom,sc7280-cnoc3";
-                       #interconnect-cells = <2>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
-               };
+                       uart0: serial@980000 {
+                               compatible = "qcom,geni-uart";
+                               reg = <0 0x00980000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S0_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_uart0_cts>, <&qup_uart0_rts>, <&qup_uart0_tx>, <&qup_uart0_rx>;
+                               interrupts = <GIC_SPI 601 IRQ_TYPE_LEVEL_HIGH>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_0 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
+                       };
 
-               mc_virt: interconnect@1580000 {
-                       reg = <0 0x01580000 0 0x4>;
-                       compatible = "qcom,sc7280-mc-virt";
-                       #interconnect-cells = <2>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
-               };
+                       i2c1: i2c@984000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0 0x00984000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S1_CLK>;
+                               clock-names = "se";
+                               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>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_0 0>,
+                                               <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config",
+                                                       "qup-memory";
+                               status = "disabled";
+                       };
 
-               system_noc: interconnect@1680000 {
-                       reg = <0 0x01680000 0 0x15480>;
-                       compatible = "qcom,sc7280-system-noc";
-                       #interconnect-cells = <2>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
-               };
+                       spi1: spi@984000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0 0x00984000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S1_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi1_data_clk>, <&qup_spi1_cs>;
+                               interrupts = <GIC_SPI 602 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_0 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
+                       };
 
-               aggre1_noc: interconnect@16e0000 {
-                       compatible = "qcom,sc7280-aggre1-noc";
-                       reg = <0 0x016e0000 0 0x1c080>;
-                       #interconnect-cells = <2>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
-               };
+                       uart1: serial@984000 {
+                               compatible = "qcom,geni-uart";
+                               reg = <0 0x00984000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S1_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_uart1_cts>, <&qup_uart1_rts>, <&qup_uart1_tx>, <&qup_uart1_rx>;
+                               interrupts = <GIC_SPI 602 IRQ_TYPE_LEVEL_HIGH>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_0 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
+                       };
 
-               aggre2_noc: interconnect@1700000 {
-                       reg = <0 0x01700000 0 0x2b080>;
-                       compatible = "qcom,sc7280-aggre2-noc";
-                       #interconnect-cells = <2>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
-               };
+                       i2c2: i2c@988000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0 0x00988000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S2_CLK>;
+                               clock-names = "se";
+                               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>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_0 0>,
+                                               <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config",
+                                                       "qup-memory";
+                               status = "disabled";
+                       };
 
-               mmss_noc: interconnect@1740000 {
-                       reg = <0 0x01740000 0 0x1e080>;
-                       compatible = "qcom,sc7280-mmss-noc";
-                       #interconnect-cells = <2>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
-               };
+                       spi2: spi@988000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0 0x00988000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S2_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi2_data_clk>, <&qup_spi2_cs>;
+                               interrupts = <GIC_SPI 603 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_0 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
+                       };
 
-               ipa: ipa@1e40000 {
-                       compatible = "qcom,sc7280-ipa";
+                       uart2: serial@988000 {
+                               compatible = "qcom,geni-uart";
+                               reg = <0 0x00988000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S2_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_uart2_cts>, <&qup_uart2_rts>, <&qup_uart2_tx>, <&qup_uart2_rx>;
+                               interrupts = <GIC_SPI 603 IRQ_TYPE_LEVEL_HIGH>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_0 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
+                       };
 
-                       iommus = <&apps_smmu 0x480 0x0>,
-                                <&apps_smmu 0x482 0x0>;
-                       reg = <0 0x1e40000 0 0x8000>,
-                             <0 0x1e50000 0 0x4ad0>,
-                             <0 0x1e04000 0 0x23000>;
-                       reg-names = "ipa-reg",
-                                   "ipa-shared",
-                                   "gsi";
+                       i2c3: i2c@98c000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0 0x0098c000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S3_CLK>;
+                               clock-names = "se";
+                               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>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_0 0>,
+                                               <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config",
+                                                       "qup-memory";
+                               status = "disabled";
+                       };
 
-                       interrupts-extended = <&intc 0 654 IRQ_TYPE_EDGE_RISING>,
-                                             <&intc 0 432 IRQ_TYPE_LEVEL_HIGH>,
-                                             <&ipa_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
-                                             <&ipa_smp2p_in 1 IRQ_TYPE_EDGE_RISING>;
-                       interrupt-names = "ipa",
-                                         "gsi",
-                                         "ipa-clock-query",
-                                         "ipa-setup-ready";
+                       spi3: spi@98c000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0 0x0098c000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S3_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi3_data_clk>, <&qup_spi3_cs>;
+                               interrupts = <GIC_SPI 604 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_0 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
+                       };
 
-                       clocks = <&rpmhcc RPMH_IPA_CLK>;
-                       clock-names = "core";
+                       uart3: serial@98c000 {
+                               compatible = "qcom,geni-uart";
+                               reg = <0 0x0098c000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S3_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_uart3_cts>, <&qup_uart3_rts>, <&qup_uart3_tx>, <&qup_uart3_rx>;
+                               interrupts = <GIC_SPI 604 IRQ_TYPE_LEVEL_HIGH>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_0 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
+                       };
 
-                       interconnects = <&aggre2_noc MASTER_IPA 0 &mc_virt SLAVE_EBI1 0>,
-                                       <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_IPA_CFG 0>;
-                       interconnect-names = "memory",
-                                            "config";
+                       i2c4: i2c@990000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0 0x00990000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S4_CLK>;
+                               clock-names = "se";
+                               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>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_0 0>,
+                                               <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config",
+                                                       "qup-memory";
+                               status = "disabled";
+                       };
 
-                       qcom,smem-states = <&ipa_smp2p_out 0>,
-                                          <&ipa_smp2p_out 1>;
-                       qcom,smem-state-names = "ipa-clock-enabled-valid",
-                                               "ipa-clock-enabled";
+                       spi4: spi@990000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0 0x00990000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S4_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi4_data_clk>, <&qup_spi4_cs>;
+                               interrupts = <GIC_SPI 605 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_0 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
+                       };
 
-                       status = "disabled";
-               };
+                       uart4: serial@990000 {
+                               compatible = "qcom,geni-uart";
+                               reg = <0 0x00990000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S4_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_uart4_cts>, <&qup_uart4_rts>, <&qup_uart4_tx>, <&qup_uart4_rx>;
+                               interrupts = <GIC_SPI 605 IRQ_TYPE_LEVEL_HIGH>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_0 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
+                       };
 
-               tcsr_mutex: hwlock@1f40000 {
-                       compatible = "qcom,tcsr-mutex", "syscon";
-                       reg = <0 0x01f40000 0 0x40000>;
-                       #hwlock-cells = <1>;
-               };
+                       i2c5: i2c@994000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0 0x00994000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S5_CLK>;
+                               clock-names = "se";
+                               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>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_0 0>,
+                                               <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config",
+                                                       "qup-memory";
+                               status = "disabled";
+                       };
 
-               lpasscc: lpasscc@3000000 {
-                       compatible = "qcom,sc7280-lpasscc";
-                       reg = <0 0x03000000 0 0x40>,
-                             <0 0x03c04000 0 0x4>,
-                             <0 0x03389000 0 0x24>;
-                       reg-names = "qdsp6ss", "top_cc", "cc";
-                       clocks = <&gcc GCC_CFG_NOC_LPASS_CLK>;
-                       clock-names = "iface";
-                       #clock-cells = <1>;
-               };
+                       spi5: spi@994000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0 0x00994000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S5_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi5_data_clk>, <&qup_spi5_cs>;
+                               interrupts = <GIC_SPI 606 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_0 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
+                       };
 
-               lpass_ag_noc: interconnect@3c40000 {
-                       reg = <0 0x03c40000 0 0xf080>;
-                       compatible = "qcom,sc7280-lpass-ag-noc";
-                       #interconnect-cells = <2>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
-               };
+                       uart5: serial@994000 {
+                               compatible = "qcom,geni-uart";
+                               reg = <0 0x00994000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S5_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_uart5_cts>, <&qup_uart5_rts>, <&qup_uart5_tx>, <&qup_uart5_rx>;
+                               interrupts = <GIC_SPI 606 IRQ_TYPE_LEVEL_HIGH>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_0 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
+                       };
 
-               gpucc: clock-controller@3d90000 {
-                       compatible = "qcom,sc7280-gpucc";
-                       reg = <0 0x03d90000 0 0x9000>;
-                       clocks = <&rpmhcc RPMH_CXO_CLK>,
-                                <&gcc GCC_GPU_GPLL0_CLK_SRC>,
-                                <&gcc GCC_GPU_GPLL0_DIV_CLK_SRC>;
-                       clock-names = "bi_tcxo",
-                                     "gcc_gpu_gpll0_clk_src",
-                                     "gcc_gpu_gpll0_div_clk_src";
-                       #clock-cells = <1>;
-                       #reset-cells = <1>;
-                       #power-domain-cells = <1>;
-               };
-
-               stm@6002000 {
-                       compatible = "arm,coresight-stm", "arm,primecell";
-                       reg = <0 0x06002000 0 0x1000>,
-                             <0 0x16280000 0 0x180000>;
-                       reg-names = "stm-base", "stm-stimulus-base";
-
-                       clocks = <&aoss_qmp>;
-                       clock-names = "apb_pclk";
-
-                       out-ports {
-                               port {
-                                       stm_out: endpoint {
-                                               remote-endpoint = <&funnel0_in7>;
-                                       };
-                               };
+                       i2c6: i2c@998000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0 0x00998000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S6_CLK>;
+                               clock-names = "se";
+                               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>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_0 0>,
+                                               <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config",
+                                                       "qup-memory";
+                               status = "disabled";
                        };
-               };
 
-               funnel@6041000 {
-                       compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
-                       reg = <0 0x06041000 0 0x1000>;
+                       spi6: spi@998000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0 0x00998000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S6_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi6_data_clk>, <&qup_spi6_cs>;
+                               interrupts = <GIC_SPI 607 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_0 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
+                       };
 
-                       clocks = <&aoss_qmp>;
-                       clock-names = "apb_pclk";
+                       uart6: serial@998000 {
+                               compatible = "qcom,geni-uart";
+                               reg = <0 0x00998000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S6_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_uart6_cts>, <&qup_uart6_rts>, <&qup_uart6_tx>, <&qup_uart6_rx>;
+                               interrupts = <GIC_SPI 607 IRQ_TYPE_LEVEL_HIGH>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_0 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
+                       };
 
-                       out-ports {
-                               port {
-                                       funnel0_out: endpoint {
-                                               remote-endpoint = <&merge_funnel_in0>;
-                                       };
-                               };
+                       i2c7: i2c@99c000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0 0x0099c000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S7_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_i2c7_data_clk>;
+                               interrupts = <GIC_SPI 608 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>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_0 0>,
+                                               <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config",
+                                                       "qup-memory";
+                               status = "disabled";
                        };
 
-                       in-ports {
+                       spi7: spi@99c000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0 0x0099c000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S7_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi7_data_clk>, <&qup_spi7_cs>;
+                               interrupts = <GIC_SPI 608 IRQ_TYPE_LEVEL_HIGH>;
                                #address-cells = <1>;
                                #size-cells = <0>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_0 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
+                       };
 
-                               port@7 {
-                                       reg = <7>;
-                                       funnel0_in7: endpoint {
-                                               remote-endpoint = <&stm_out>;
-                                       };
-                               };
+                       uart7: serial@99c000 {
+                               compatible = "qcom,geni-uart";
+                               reg = <0 0x0099c000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP0_S7_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_uart7_cts>, <&qup_uart7_rts>, <&qup_uart7_tx>, <&qup_uart7_rx>;
+                               interrupts = <GIC_SPI 608 IRQ_TYPE_LEVEL_HIGH>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_0 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
                        };
                };
 
-               funnel@6042000 {
-                       compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
-                       reg = <0 0x06042000 0 0x1000>;
-
-                       clocks = <&aoss_qmp>;
-                       clock-names = "apb_pclk";
+               qupv3_id_1: geniqup@ac0000 {
+                       compatible = "qcom,geni-se-qup";
+                       reg = <0 0x00ac0000 0 0x2000>;
+                       clocks = <&gcc GCC_QUPV3_WRAP_1_M_AHB_CLK>,
+                                <&gcc GCC_QUPV3_WRAP_1_S_AHB_CLK>;
+                       clock-names = "m-ahb", "s-ahb";
+                       #address-cells = <2>;
+                       #size-cells = <2>;
+                       ranges;
+                       iommus = <&apps_smmu 0x43 0x0>;
+                       status = "disabled";
 
-                       out-ports {
-                               port {
-                                       funnel1_out: endpoint {
-                                               remote-endpoint = <&merge_funnel_in1>;
-                                       };
-                               };
+                       i2c8: i2c@a80000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0 0x00a80000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S0_CLK>;
+                               clock-names = "se";
+                               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>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_1 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config",
+                                                       "qup-memory";
+                               status = "disabled";
                        };
 
-                       in-ports {
+                       spi8: spi@a80000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0 0x00a80000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S0_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi8_data_clk>, <&qup_spi8_cs>;
+                               interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
                                #address-cells = <1>;
                                #size-cells = <0>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_1 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
+                       };
 
-                               port@4 {
-                                       reg = <4>;
-                                       funnel1_in4: endpoint {
-                                               remote-endpoint = <&apss_merge_funnel_out>;
-                                       };
-                               };
+                       uart8: serial@a80000 {
+                               compatible = "qcom,geni-uart";
+                               reg = <0 0x00a80000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S0_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_uart8_cts>, <&qup_uart8_rts>, <&qup_uart8_tx>, <&qup_uart8_rx>;
+                               interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_1 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
                        };
-               };
 
-               funnel@6045000 {
-                       compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
-                       reg = <0 0x06045000 0 0x1000>;
+                       i2c9: i2c@a84000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0 0x00a84000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S1_CLK>;
+                               clock-names = "se";
+                               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>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_1 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config",
+                                                       "qup-memory";
+                               status = "disabled";
+                       };
 
-                       clocks = <&aoss_qmp>;
-                       clock-names = "apb_pclk";
+                       spi9: spi@a84000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0 0x00a84000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S1_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi9_data_clk>, <&qup_spi9_cs>;
+                               interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_1 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
+                       };
 
-                       out-ports {
-                               port {
-                                       merge_funnel_out: endpoint {
-                                               remote-endpoint = <&swao_funnel_in>;
-                                       };
-                               };
+                       uart9: serial@a84000 {
+                               compatible = "qcom,geni-uart";
+                               reg = <0 0x00a84000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S1_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_uart9_cts>, <&qup_uart9_rts>, <&qup_uart9_tx>, <&qup_uart9_rx>;
+                               interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_1 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
                        };
 
-                       in-ports {
+                       i2c10: i2c@a88000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0 0x00a88000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S2_CLK>;
+                               clock-names = "se";
+                               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>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_1 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config",
+                                                       "qup-memory";
+                               status = "disabled";
+                       };
 
-                               port@0 {
-                                       reg = <0>;
-                                       merge_funnel_in0: endpoint {
-                                               remote-endpoint = <&funnel0_out>;
-                                       };
-                               };
-
-                               port@1 {
-                                       reg = <1>;
-                                       merge_funnel_in1: endpoint {
-                                               remote-endpoint = <&funnel1_out>;
-                                       };
-                               };
+                       spi10: spi@a88000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0 0x00a88000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S2_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi10_data_clk>, <&qup_spi10_cs>;
+                               interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_1 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
                        };
-               };
 
-               replicator@6046000 {
-                       compatible = "arm,coresight-dynamic-replicator", "arm,primecell";
-                       reg = <0 0x06046000 0 0x1000>;
+                       uart10: serial@a88000 {
+                               compatible = "qcom,geni-uart";
+                               reg = <0 0x00a88000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S2_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_uart10_cts>, <&qup_uart10_rts>, <&qup_uart10_tx>, <&qup_uart10_rx>;
+                               interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_1 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
+                       };
 
-                       clocks = <&aoss_qmp>;
-                       clock-names = "apb_pclk";
+                       i2c11: i2c@a8c000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0 0x00a8c000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S3_CLK>;
+                               clock-names = "se";
+                               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>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_1 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config",
+                                                       "qup-memory";
+                               status = "disabled";
+                       };
 
-                       out-ports {
-                               port {
-                                       replicator_out: endpoint {
-                                               remote-endpoint = <&etr_in>;
-                                       };
-                               };
+                       spi11: spi@a8c000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0 0x00a8c000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S3_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi11_data_clk>, <&qup_spi11_cs>;
+                               interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_1 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
                        };
 
-                       in-ports {
-                               port {
-                                       replicator_in: endpoint {
-                                               remote-endpoint = <&swao_replicator_out>;
-                                       };
-                               };
+                       uart11: serial@a8c000 {
+                               compatible = "qcom,geni-uart";
+                               reg = <0 0x00a8c000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S3_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_uart11_cts>, <&qup_uart11_rts>, <&qup_uart11_tx>, <&qup_uart11_rx>;
+                               interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_1 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
                        };
-               };
 
-               etr@6048000 {
-                       compatible = "arm,coresight-tmc", "arm,primecell";
-                       reg = <0 0x06048000 0 0x1000>;
-                       iommus = <&apps_smmu 0x04c0 0>;
+                       i2c12: i2c@a90000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0 0x00a90000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S4_CLK>;
+                               clock-names = "se";
+                               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>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_1 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config",
+                                                       "qup-memory";
+                               status = "disabled";
+                       };
 
-                       clocks = <&aoss_qmp>;
-                       clock-names = "apb_pclk";
-                       arm,scatter-gather;
+                       spi12: spi@a90000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0 0x00a90000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S4_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi12_data_clk>, <&qup_spi12_cs>;
+                               interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_1 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
+                       };
 
-                       in-ports {
-                               port {
-                                       etr_in: endpoint {
-                                               remote-endpoint = <&replicator_out>;
-                                       };
-                               };
+                       uart12: serial@a90000 {
+                               compatible = "qcom,geni-uart";
+                               reg = <0 0x00a90000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S4_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_uart12_cts>, <&qup_uart12_rts>, <&qup_uart12_tx>, <&qup_uart12_rx>;
+                               interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_1 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
                        };
-               };
 
-               funnel@6b04000 {
-                       compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
-                       reg = <0 0x06b04000 0 0x1000>;
+                       i2c13: i2c@a94000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0 0x00a94000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S5_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_i2c13_data_clk>;
+                               interrupts = <GIC_SPI 358 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>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_1 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config",
+                                                       "qup-memory";
+                               status = "disabled";
+                       };
 
-                       clocks = <&aoss_qmp>;
-                       clock-names = "apb_pclk";
+                       spi13: spi@a94000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0 0x00a94000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S5_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi13_data_clk>, <&qup_spi13_cs>;
+                               interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_1 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
+                       };
 
-                       out-ports {
-                               port {
-                                       swao_funnel_out: endpoint {
-                                               remote-endpoint = <&etf_in>;
-                                       };
-                               };
+                       uart13: serial@a94000 {
+                               compatible = "qcom,geni-uart";
+                               reg = <0 0x00a94000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S5_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_uart13_cts>, <&qup_uart13_rts>, <&qup_uart13_tx>, <&qup_uart13_rx>;
+                               interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_1 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
                        };
 
-                       in-ports {
+                       i2c14: i2c@a98000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0 0x00a98000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S6_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_i2c14_data_clk>;
+                               interrupts = <GIC_SPI 368 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>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_1 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config",
+                                                       "qup-memory";
+                               status = "disabled";
+                       };
 
-                               port@7 {
-                                       reg = <7>;
-                                       swao_funnel_in: endpoint {
-                                               remote-endpoint = <&merge_funnel_out>;
-                                       };
+                       spi14: spi@a98000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0 0x00a98000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S6_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi14_data_clk>, <&qup_spi14_cs>;
+                               interrupts = <GIC_SPI 368 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_1 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
+                       };
+
+                       uart14: serial@a98000 {
+                               compatible = "qcom,geni-uart";
+                               reg = <0 0x00a98000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S6_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_uart14_cts>, <&qup_uart14_rts>, <&qup_uart14_tx>, <&qup_uart14_rx>;
+                               interrupts = <GIC_SPI 368 IRQ_TYPE_LEVEL_HIGH>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_1 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
+                       };
+
+                       i2c15: i2c@a9c000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0 0x00a9c000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S7_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_i2c15_data_clk>;
+                               interrupts = <GIC_SPI 369 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>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_1 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
+                               interconnect-names = "qup-core", "qup-config",
+                                                       "qup-memory";
+                               status = "disabled";
+                       };
+
+                       spi15: spi@a9c000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0 0x00a9c000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S7_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_spi15_data_clk>, <&qup_spi15_cs>;
+                               interrupts = <GIC_SPI 369 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_1 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
+                       };
+
+                       uart15: serial@a9c000 {
+                               compatible = "qcom,geni-uart";
+                               reg = <0 0x00a9c000 0 0x4000>;
+                               clocks = <&gcc GCC_QUPV3_WRAP1_S7_CLK>;
+                               clock-names = "se";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&qup_uart15_cts>, <&qup_uart15_rts>, <&qup_uart15_tx>, <&qup_uart15_rx>;
+                               interrupts = <GIC_SPI 369 IRQ_TYPE_LEVEL_HIGH>;
+                               power-domains = <&rpmhpd SC7280_CX>;
+                               operating-points-v2 = <&qup_opp_table>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_QUP_1 0>;
+                               interconnect-names = "qup-core", "qup-config";
+                               status = "disabled";
+                       };
+               };
+
+               cnoc2: interconnect@1500000 {
+                       reg = <0 0x01500000 0 0x1000>;
+                       compatible = "qcom,sc7280-cnoc2";
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
+
+               cnoc3: interconnect@1502000 {
+                       reg = <0 0x01502000 0 0x1000>;
+                       compatible = "qcom,sc7280-cnoc3";
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
+
+               mc_virt: interconnect@1580000 {
+                       reg = <0 0x01580000 0 0x4>;
+                       compatible = "qcom,sc7280-mc-virt";
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
+
+               system_noc: interconnect@1680000 {
+                       reg = <0 0x01680000 0 0x15480>;
+                       compatible = "qcom,sc7280-system-noc";
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
+
+               aggre1_noc: interconnect@16e0000 {
+                       compatible = "qcom,sc7280-aggre1-noc";
+                       reg = <0 0x016e0000 0 0x1c080>;
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
+
+               aggre2_noc: interconnect@1700000 {
+                       reg = <0 0x01700000 0 0x2b080>;
+                       compatible = "qcom,sc7280-aggre2-noc";
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
+
+               mmss_noc: interconnect@1740000 {
+                       reg = <0 0x01740000 0 0x1e080>;
+                       compatible = "qcom,sc7280-mmss-noc";
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
+
+               pcie1: pci@1c08000 {
+                       compatible = "qcom,pcie-sc7280";
+                       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 0x0 0x40200000 0x0 0x100000>,
+                                <0x02000000 0x0 0x40300000 0x0 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 434 IRQ_TYPE_LEVEL_HIGH>,
+                                       <0 0 0 2 &intc 0 435 IRQ_TYPE_LEVEL_HIGH>,
+                                       <0 0 0 3 &intc 0 438 IRQ_TYPE_LEVEL_HIGH>,
+                                       <0 0 0 4 &intc 0 439 IRQ_TYPE_LEVEL_HIGH>;
+
+                       clocks = <&gcc GCC_PCIE_1_PIPE_CLK>,
+                                <&gcc GCC_PCIE_1_PIPE_CLK_SRC>,
+                                <&pcie1_lane 0>,
+                                <&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_AGGRE_NOC_PCIE_TBU_CLK>,
+                                <&gcc GCC_DDRSS_PCIE_SF_CLK>;
+
+                       clock-names = "pipe",
+                                     "pipe_mux",
+                                     "phy_pipe",
+                                     "ref",
+                                     "aux",
+                                     "cfg",
+                                     "bus_master",
+                                     "bus_slave",
+                                     "slave_q2a",
+                                     "tbu",
+                                     "ddrss_sf_tbu";
+
+                       assigned-clocks = <&gcc GCC_PCIE_1_AUX_CLK>;
+                       assigned-clock-rates = <19200000>;
+
+                       resets = <&gcc GCC_PCIE_1_BCR>;
+                       reset-names = "pci";
+
+                       power-domains = <&gcc GCC_PCIE_1_GDSC>;
+
+                       phys = <&pcie1_lane>;
+                       phy-names = "pciephy";
+
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pcie1_clkreq_n>;
+
+                       iommus = <&apps_smmu 0x1c80 0x1>;
+
+                       iommu-map = <0x0 &apps_smmu 0x1c80 0x1>,
+                                   <0x100 &apps_smmu 0x1c81 0x1>;
+
+                       status = "disabled";
+               };
+
+               pcie1_phy: phy@1c0e000 {
+                       compatible = "qcom,sm8250-qmp-gen3x2-pcie-phy";
+                       reg = <0 0x01c0e000 0 0x1c0>;
+                       #address-cells = <2>;
+                       #size-cells = <2>;
+                       ranges;
+                       clocks = <&gcc GCC_PCIE_1_AUX_CLK>,
+                                <&gcc GCC_PCIE_1_CFG_AHB_CLK>,
+                                <&gcc GCC_PCIE_CLKREF_EN>,
+                                <&gcc GCC_PCIE1_PHY_RCHNG_CLK>;
+                       clock-names = "aux", "cfg_ahb", "ref", "refgen";
+
+                       resets = <&gcc GCC_PCIE_1_PHY_BCR>;
+                       reset-names = "phy";
+
+                       assigned-clocks = <&gcc GCC_PCIE1_PHY_RCHNG_CLK>;
+                       assigned-clock-rates = <100000000>;
+
+                       status = "disabled";
+
+                       pcie1_lane: lanes@1c0e200 {
+                               reg = <0 0x01c0e200 0 0x170>,
+                                     <0 0x01c0e400 0 0x200>,
+                                     <0 0x01c0ea00 0 0x1f0>,
+                                     <0 0x01c0e600 0 0x170>,
+                                     <0 0x01c0e800 0 0x200>,
+                                     <0 0x01c0ee00 0 0xf4>;
+                               clocks = <&gcc GCC_PCIE_1_PIPE_CLK>;
+                               clock-names = "pipe0";
+
+                               #phy-cells = <0>;
+                               #clock-cells = <1>;
+                               clock-output-names = "pcie_1_pipe_clk";
+                       };
+               };
+
+               ipa: ipa@1e40000 {
+                       compatible = "qcom,sc7280-ipa";
+
+                       iommus = <&apps_smmu 0x480 0x0>,
+                                <&apps_smmu 0x482 0x0>;
+                       reg = <0 0x1e40000 0 0x8000>,
+                             <0 0x1e50000 0 0x4ad0>,
+                             <0 0x1e04000 0 0x23000>;
+                       reg-names = "ipa-reg",
+                                   "ipa-shared",
+                                   "gsi";
+
+                       interrupts-extended = <&intc GIC_SPI 654 IRQ_TYPE_EDGE_RISING>,
+                                             <&intc GIC_SPI 432 IRQ_TYPE_LEVEL_HIGH>,
+                                             <&ipa_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
+                                             <&ipa_smp2p_in 1 IRQ_TYPE_EDGE_RISING>;
+                       interrupt-names = "ipa",
+                                         "gsi",
+                                         "ipa-clock-query",
+                                         "ipa-setup-ready";
+
+                       clocks = <&rpmhcc RPMH_IPA_CLK>;
+                       clock-names = "core";
+
+                       interconnects = <&aggre2_noc MASTER_IPA 0 &mc_virt SLAVE_EBI1 0>,
+                                       <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_IPA_CFG 0>;
+                       interconnect-names = "memory",
+                                            "config";
+
+                       qcom,smem-states = <&ipa_smp2p_out 0>,
+                                          <&ipa_smp2p_out 1>;
+                       qcom,smem-state-names = "ipa-clock-enabled-valid",
+                                               "ipa-clock-enabled";
+
+                       status = "disabled";
+               };
+
+               tcsr_mutex: hwlock@1f40000 {
+                       compatible = "qcom,tcsr-mutex", "syscon";
+                       reg = <0 0x01f40000 0 0x40000>;
+                       #hwlock-cells = <1>;
+               };
+
+               tcsr: syscon@1fc0000 {
+                       compatible = "qcom,sc7280-tcsr", "syscon";
+                       reg = <0 0x01fc0000 0 0x30000>;
+               };
+
+               lpasscc: lpasscc@3000000 {
+                       compatible = "qcom,sc7280-lpasscc";
+                       reg = <0 0x03000000 0 0x40>,
+                             <0 0x03c04000 0 0x4>,
+                             <0 0x03389000 0 0x24>;
+                       reg-names = "qdsp6ss", "top_cc", "cc";
+                       clocks = <&gcc GCC_CFG_NOC_LPASS_CLK>;
+                       clock-names = "iface";
+                       #clock-cells = <1>;
+               };
+
+               lpass_ag_noc: interconnect@3c40000 {
+                       reg = <0 0x03c40000 0 0xf080>;
+                       compatible = "qcom,sc7280-lpass-ag-noc";
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
+
+               gpu: gpu@3d00000 {
+                       compatible = "qcom,adreno-635.0", "qcom,adreno";
+                       #stream-id-cells = <16>;
+                       reg = <0 0x03d00000 0 0x40000>,
+                             <0 0x03d9e000 0 0x1000>,
+                             <0 0x03d61000 0 0x800>;
+                       reg-names = "kgsl_3d0_reg_memory",
+                                   "cx_mem",
+                                   "cx_dbgc";
+                       interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH>;
+                       iommus = <&adreno_smmu 0 0x401>;
+                       operating-points-v2 = <&gpu_opp_table>;
+                       qcom,gmu = <&gmu>;
+                       interconnects = <&gem_noc MASTER_GFX3D 0 &mc_virt SLAVE_EBI1 0>;
+                       interconnect-names = "gfx-mem";
+                       #cooling-cells = <2>;
+
+                       gpu_opp_table: opp-table {
+                               compatible = "operating-points-v2";
+
+                               opp-315000000 {
+                                       opp-hz = /bits/ 64 <315000000>;
+                                       opp-level = <RPMH_REGULATOR_LEVEL_LOW_SVS>;
+                                       opp-peak-kBps = <1804000>;
+                               };
+
+                               opp-450000000 {
+                                       opp-hz = /bits/ 64 <450000000>;
+                                       opp-level = <RPMH_REGULATOR_LEVEL_SVS>;
+                                       opp-peak-kBps = <4068000>;
+                               };
+
+                               opp-550000000 {
+                                       opp-hz = /bits/ 64 <550000000>;
+                                       opp-level = <RPMH_REGULATOR_LEVEL_SVS_L1>;
+                                       opp-peak-kBps = <6832000>;
                                };
                        };
                };
 
-               etf@6b05000 {
-                       compatible = "arm,coresight-tmc", "arm,primecell";
-                       reg = <0 0x06b05000 0 0x1000>;
+               gmu: gmu@3d69000 {
+                       compatible="qcom,adreno-gmu-635.0", "qcom,adreno-gmu";
+                       reg = <0 0x03d6a000 0 0x34000>,
+                               <0 0x3de0000 0 0x10000>,
+                               <0 0x0b290000 0 0x10000>;
+                       reg-names = "gmu", "rscc", "gmu_pdc";
+                       interrupts = <GIC_SPI 304 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 305 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "hfi", "gmu";
+                       clocks = <&gpucc 5>,
+                                       <&gpucc 8>,
+                                       <&gcc GCC_DDRSS_GPU_AXI_CLK>,
+                                       <&gcc GCC_GPU_MEMNOC_GFX_CLK>,
+                                       <&gpucc 2>,
+                                       <&gpucc 15>,
+                                       <&gpucc 11>;
+                       clock-names = "gmu",
+                                     "cxo",
+                                     "axi",
+                                     "memnoc",
+                                     "ahb",
+                                     "hub",
+                                     "smmu_vote";
+                       power-domains = <&gpucc 0>,
+                                       <&gpucc 1>;
+                       power-domain-names = "cx",
+                                            "gx";
+                       iommus = <&adreno_smmu 5 0x400>;
+                       operating-points-v2 = <&gmu_opp_table>;
+
+                       gmu_opp_table: opp-table {
+                               compatible = "operating-points-v2";
+
+                               opp-200000000 {
+                                       opp-hz = /bits/ 64 <200000000>;
+                                       opp-level = <RPMH_REGULATOR_LEVEL_MIN_SVS>;
+                               };
+                       };
+               };
+
+               gpucc: clock-controller@3d90000 {
+                       compatible = "qcom,sc7280-gpucc";
+                       reg = <0 0x03d90000 0 0x9000>;
+                       clocks = <&rpmhcc RPMH_CXO_CLK>,
+                                <&gcc GCC_GPU_GPLL0_CLK_SRC>,
+                                <&gcc GCC_GPU_GPLL0_DIV_CLK_SRC>;
+                       clock-names = "bi_tcxo",
+                                     "gcc_gpu_gpll0_clk_src",
+                                     "gcc_gpu_gpll0_div_clk_src";
+                       #clock-cells = <1>;
+                       #reset-cells = <1>;
+                       #power-domain-cells = <1>;
+               };
+
+               adreno_smmu: iommu@3da0000 {
+                       compatible = "qcom,sc7280-smmu-500", "qcom,adreno-smmu", "arm,mmu-500";
+                       reg = <0 0x03da0000 0 0x20000>;
+                       #iommu-cells = <2>;
+                       #global-interrupts = <2>;
+                       interrupts = <GIC_SPI 673 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 675 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 678 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 679 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 680 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 681 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 682 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 683 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 684 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 685 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 686 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 687 IRQ_TYPE_LEVEL_HIGH>;
+
+                       clocks = <&gcc GCC_GPU_MEMNOC_GFX_CLK>,
+                                       <&gcc GCC_GPU_SNOC_DVM_GFX_CLK>,
+                                       <&gpucc 2>,
+                                       <&gpucc 11>,
+                                       <&gpucc 5>,
+                                       <&gpucc 15>,
+                                       <&gpucc 13>;
+                       clock-names = "gcc_gpu_memnoc_gfx_clk",
+                                       "gcc_gpu_snoc_dvm_gfx_clk",
+                                       "gpu_cc_ahb_clk",
+                                       "gpu_cc_hlos1_vote_gpu_smmu_clk",
+                                       "gpu_cc_cx_gmu_clk",
+                                       "gpu_cc_hub_cx_int_clk",
+                                       "gpu_cc_hub_aon_clk";
+
+                       power-domains = <&gpucc 0>;
+               };
+
+               remoteproc_mpss: remoteproc@4080000 {
+                       compatible = "qcom,sc7280-mpss-pas";
+                       reg = <0 0x04080000 0 0x10000>, <0 0x04180000 0 0x48>;
+                       reg-names = "qdsp6", "rmb";
+
+                       interrupts-extended = <&intc GIC_SPI 264 IRQ_TYPE_EDGE_RISING>,
+                                             <&modem_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
+                                             <&modem_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
+                                             <&modem_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
+                                             <&modem_smp2p_in 3 IRQ_TYPE_EDGE_RISING>,
+                                             <&modem_smp2p_in 7 IRQ_TYPE_EDGE_RISING>;
+                       interrupt-names = "wdog", "fatal", "ready", "handover",
+                                         "stop-ack", "shutdown-ack";
+
+                       clocks = <&gcc GCC_MSS_CFG_AHB_CLK>,
+                                <&gcc GCC_MSS_OFFLINE_AXI_CLK>,
+                                <&gcc GCC_MSS_SNOC_AXI_CLK>,
+                                <&rpmhcc RPMH_PKA_CLK>,
+                                <&rpmhcc RPMH_CXO_CLK>;
+                       clock-names = "iface", "offline", "snoc_axi", "pka", "xo";
+
+                       power-domains = <&rpmhpd SC7280_CX>,
+                                       <&rpmhpd SC7280_MSS>;
+                       power-domain-names = "cx", "mss";
+
+                       memory-region = <&mpss_mem>;
+
+                       qcom,qmp = <&aoss_qmp>;
+
+                       qcom,smem-states = <&modem_smp2p_out 0>;
+                       qcom,smem-state-names = "stop";
+
+                       resets = <&aoss_reset AOSS_CC_MSS_RESTART>,
+                                <&pdc_reset PDC_MODEM_SYNC_RESET>;
+                       reset-names = "mss_restart", "pdc_reset";
+
+                       qcom,halt-regs = <&tcsr_mutex 0x23000 0x25000 0x28000 0x33000>;
+                       qcom,ext-regs = <&tcsr 0x10000 0x10004 &tcsr_mutex 0x26004 0x26008>;
+                       qcom,qaccept-regs = <&tcsr_mutex 0x23030 0x23040 0x23020>;
+
+                       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>;
+                               label = "modem";
+                               qcom,remote-pid = <1>;
+                       };
+               };
+
+               stm@6002000 {
+                       compatible = "arm,coresight-stm", "arm,primecell";
+                       reg = <0 0x06002000 0 0x1000>,
+                             <0 0x16280000 0 0x180000>;
+                       reg-names = "stm-base", "stm-stimulus-base";
 
                        clocks = <&aoss_qmp>;
                        clock-names = "apb_pclk";
 
                        out-ports {
                                port {
-                                       etf_out: endpoint {
-                                               remote-endpoint = <&swao_replicator_in>;
+                                       stm_out: endpoint {
+                                               remote-endpoint = <&funnel0_in7>;
                                        };
                                };
                        };
+               };
 
-                       in-ports {
+               funnel@6041000 {
+                       compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
+                       reg = <0 0x06041000 0 0x1000>;
+
+                       clocks = <&aoss_qmp>;
+                       clock-names = "apb_pclk";
+
+                       out-ports {
                                port {
-                                       etf_in: endpoint {
-                                               remote-endpoint = <&swao_funnel_out>;
+                                       funnel0_out: endpoint {
+                                               remote-endpoint = <&merge_funnel_in0>;
                                        };
                                };
                        };
+
+                       in-ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@7 {
+                                       reg = <7>;
+                                       funnel0_in7: endpoint {
+                                               remote-endpoint = <&stm_out>;
+                                       };
+                               };
+                       };
+               };
+
+               funnel@6042000 {
+                       compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
+                       reg = <0 0x06042000 0 0x1000>;
+
+                       clocks = <&aoss_qmp>;
+                       clock-names = "apb_pclk";
+
+                       out-ports {
+                               port {
+                                       funnel1_out: endpoint {
+                                               remote-endpoint = <&merge_funnel_in1>;
+                                       };
+                               };
+                       };
+
+                       in-ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@4 {
+                                       reg = <4>;
+                                       funnel1_in4: endpoint {
+                                               remote-endpoint = <&apss_merge_funnel_out>;
+                                       };
+                               };
+                       };
+               };
+
+               funnel@6045000 {
+                       compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
+                       reg = <0 0x06045000 0 0x1000>;
+
+                       clocks = <&aoss_qmp>;
+                       clock-names = "apb_pclk";
+
+                       out-ports {
+                               port {
+                                       merge_funnel_out: endpoint {
+                                               remote-endpoint = <&swao_funnel_in>;
+                                       };
+                               };
+                       };
+
+                       in-ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+                                       merge_funnel_in0: endpoint {
+                                               remote-endpoint = <&funnel0_out>;
+                                       };
+                               };
+
+                               port@1 {
+                                       reg = <1>;
+                                       merge_funnel_in1: endpoint {
+                                               remote-endpoint = <&funnel1_out>;
+                                       };
+                               };
+                       };
+               };
+
+               replicator@6046000 {
+                       compatible = "arm,coresight-dynamic-replicator", "arm,primecell";
+                       reg = <0 0x06046000 0 0x1000>;
+
+                       clocks = <&aoss_qmp>;
+                       clock-names = "apb_pclk";
+
+                       out-ports {
+                               port {
+                                       replicator_out: endpoint {
+                                               remote-endpoint = <&etr_in>;
+                                       };
+                               };
+                       };
+
+                       in-ports {
+                               port {
+                                       replicator_in: endpoint {
+                                               remote-endpoint = <&swao_replicator_out>;
+                                       };
+                               };
+                       };
+               };
+
+               etr@6048000 {
+                       compatible = "arm,coresight-tmc", "arm,primecell";
+                       reg = <0 0x06048000 0 0x1000>;
+                       iommus = <&apps_smmu 0x04c0 0>;
+
+                       clocks = <&aoss_qmp>;
+                       clock-names = "apb_pclk";
+                       arm,scatter-gather;
+
+                       in-ports {
+                               port {
+                                       etr_in: endpoint {
+                                               remote-endpoint = <&replicator_out>;
+                                       };
+                               };
+                       };
+               };
+
+               funnel@6b04000 {
+                       compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
+                       reg = <0 0x06b04000 0 0x1000>;
+
+                       clocks = <&aoss_qmp>;
+                       clock-names = "apb_pclk";
+
+                       out-ports {
+                               port {
+                                       swao_funnel_out: endpoint {
+                                               remote-endpoint = <&etf_in>;
+                                       };
+                               };
+                       };
+
+                       in-ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@7 {
+                                       reg = <7>;
+                                       swao_funnel_in: endpoint {
+                                               remote-endpoint = <&merge_funnel_out>;
+                                       };
+                               };
+                       };
+               };
+
+               etf@6b05000 {
+                       compatible = "arm,coresight-tmc", "arm,primecell";
+                       reg = <0 0x06b05000 0 0x1000>;
+
+                       clocks = <&aoss_qmp>;
+                       clock-names = "apb_pclk";
+
+                       out-ports {
+                               port {
+                                       etf_out: endpoint {
+                                               remote-endpoint = <&swao_replicator_in>;
+                                       };
+                               };
+                       };
+
+                       in-ports {
+                               port {
+                                       etf_in: endpoint {
+                                               remote-endpoint = <&swao_funnel_out>;
+                                       };
+                               };
+                       };
+               };
+
+               replicator@6b06000 {
+                       compatible = "arm,coresight-dynamic-replicator", "arm,primecell";
+                       reg = <0 0x06b06000 0 0x1000>;
+
+                       clocks = <&aoss_qmp>;
+                       clock-names = "apb_pclk";
+                       qcom,replicator-loses-context;
+
+                       out-ports {
+                               port {
+                                       swao_replicator_out: endpoint {
+                                               remote-endpoint = <&replicator_in>;
+                                       };
+                               };
+                       };
+
+                       in-ports {
+                               port {
+                                       swao_replicator_in: endpoint {
+                                               remote-endpoint = <&etf_out>;
+                                       };
+                               };
+                       };
+               };
+
+               etm@7040000 {
+                       compatible = "arm,coresight-etm4x", "arm,primecell";
+                       reg = <0 0x07040000 0 0x1000>;
+
+                       cpu = <&CPU0>;
+
+                       clocks = <&aoss_qmp>;
+                       clock-names = "apb_pclk";
+                       arm,coresight-loses-context-with-cpu;
+                       qcom,skip-power-up;
+
+                       out-ports {
+                               port {
+                                       etm0_out: endpoint {
+                                               remote-endpoint = <&apss_funnel_in0>;
+                                       };
+                               };
+                       };
+               };
+
+               etm@7140000 {
+                       compatible = "arm,coresight-etm4x", "arm,primecell";
+                       reg = <0 0x07140000 0 0x1000>;
+
+                       cpu = <&CPU1>;
+
+                       clocks = <&aoss_qmp>;
+                       clock-names = "apb_pclk";
+                       arm,coresight-loses-context-with-cpu;
+                       qcom,skip-power-up;
+
+                       out-ports {
+                               port {
+                                       etm1_out: endpoint {
+                                               remote-endpoint = <&apss_funnel_in1>;
+                                       };
+                               };
+                       };
+               };
+
+               etm@7240000 {
+                       compatible = "arm,coresight-etm4x", "arm,primecell";
+                       reg = <0 0x07240000 0 0x1000>;
+
+                       cpu = <&CPU2>;
+
+                       clocks = <&aoss_qmp>;
+                       clock-names = "apb_pclk";
+                       arm,coresight-loses-context-with-cpu;
+                       qcom,skip-power-up;
+
+                       out-ports {
+                               port {
+                                       etm2_out: endpoint {
+                                               remote-endpoint = <&apss_funnel_in2>;
+                                       };
+                               };
+                       };
+               };
+
+               etm@7340000 {
+                       compatible = "arm,coresight-etm4x", "arm,primecell";
+                       reg = <0 0x07340000 0 0x1000>;
+
+                       cpu = <&CPU3>;
+
+                       clocks = <&aoss_qmp>;
+                       clock-names = "apb_pclk";
+                       arm,coresight-loses-context-with-cpu;
+                       qcom,skip-power-up;
+
+                       out-ports {
+                               port {
+                                       etm3_out: endpoint {
+                                               remote-endpoint = <&apss_funnel_in3>;
+                                       };
+                               };
+                       };
+               };
+
+               etm@7440000 {
+                       compatible = "arm,coresight-etm4x", "arm,primecell";
+                       reg = <0 0x07440000 0 0x1000>;
+
+                       cpu = <&CPU4>;
+
+                       clocks = <&aoss_qmp>;
+                       clock-names = "apb_pclk";
+                       arm,coresight-loses-context-with-cpu;
+                       qcom,skip-power-up;
+
+                       out-ports {
+                               port {
+                                       etm4_out: endpoint {
+                                               remote-endpoint = <&apss_funnel_in4>;
+                                       };
+                               };
+                       };
+               };
+
+               etm@7540000 {
+                       compatible = "arm,coresight-etm4x", "arm,primecell";
+                       reg = <0 0x07540000 0 0x1000>;
+
+                       cpu = <&CPU5>;
+
+                       clocks = <&aoss_qmp>;
+                       clock-names = "apb_pclk";
+                       arm,coresight-loses-context-with-cpu;
+                       qcom,skip-power-up;
+
+                       out-ports {
+                               port {
+                                       etm5_out: endpoint {
+                                               remote-endpoint = <&apss_funnel_in5>;
+                                       };
+                               };
+                       };
+               };
+
+               etm@7640000 {
+                       compatible = "arm,coresight-etm4x", "arm,primecell";
+                       reg = <0 0x07640000 0 0x1000>;
+
+                       cpu = <&CPU6>;
+
+                       clocks = <&aoss_qmp>;
+                       clock-names = "apb_pclk";
+                       arm,coresight-loses-context-with-cpu;
+                       qcom,skip-power-up;
+
+                       out-ports {
+                               port {
+                                       etm6_out: endpoint {
+                                               remote-endpoint = <&apss_funnel_in6>;
+                                       };
+                               };
+                       };
+               };
+
+               etm@7740000 {
+                       compatible = "arm,coresight-etm4x", "arm,primecell";
+                       reg = <0 0x07740000 0 0x1000>;
+
+                       cpu = <&CPU7>;
+
+                       clocks = <&aoss_qmp>;
+                       clock-names = "apb_pclk";
+                       arm,coresight-loses-context-with-cpu;
+                       qcom,skip-power-up;
+
+                       out-ports {
+                               port {
+                                       etm7_out: endpoint {
+                                               remote-endpoint = <&apss_funnel_in7>;
+                                       };
+                               };
+                       };
+               };
+
+               funnel@7800000 { /* APSS Funnel */
+                       compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
+                       reg = <0 0x07800000 0 0x1000>;
+
+                       clocks = <&aoss_qmp>;
+                       clock-names = "apb_pclk";
+
+                       out-ports {
+                               port {
+                                       apss_funnel_out: endpoint {
+                                               remote-endpoint = <&apss_merge_funnel_in>;
+                                       };
+                               };
+                       };
+
+                       in-ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+                                       apss_funnel_in0: endpoint {
+                                               remote-endpoint = <&etm0_out>;
+                                       };
+                               };
+
+                               port@1 {
+                                       reg = <1>;
+                                       apss_funnel_in1: endpoint {
+                                               remote-endpoint = <&etm1_out>;
+                                       };
+                               };
+
+                               port@2 {
+                                       reg = <2>;
+                                       apss_funnel_in2: endpoint {
+                                               remote-endpoint = <&etm2_out>;
+                                       };
+                               };
+
+                               port@3 {
+                                       reg = <3>;
+                                       apss_funnel_in3: endpoint {
+                                               remote-endpoint = <&etm3_out>;
+                                       };
+                               };
+
+                               port@4 {
+                                       reg = <4>;
+                                       apss_funnel_in4: endpoint {
+                                               remote-endpoint = <&etm4_out>;
+                                       };
+                               };
+
+                               port@5 {
+                                       reg = <5>;
+                                       apss_funnel_in5: endpoint {
+                                               remote-endpoint = <&etm5_out>;
+                                       };
+                               };
+
+                               port@6 {
+                                       reg = <6>;
+                                       apss_funnel_in6: endpoint {
+                                               remote-endpoint = <&etm6_out>;
+                                       };
+                               };
+
+                               port@7 {
+                                       reg = <7>;
+                                       apss_funnel_in7: endpoint {
+                                               remote-endpoint = <&etm7_out>;
+                                       };
+                               };
+                       };
+               };
+
+               funnel@7810000 {
+                       compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
+                       reg = <0 0x07810000 0 0x1000>;
+
+                       clocks = <&aoss_qmp>;
+                       clock-names = "apb_pclk";
+
+                       out-ports {
+                               port {
+                                       apss_merge_funnel_out: endpoint {
+                                               remote-endpoint = <&funnel1_in4>;
+                                       };
+                               };
+                       };
+
+                       in-ports {
+                               port {
+                                       apss_merge_funnel_in: endpoint {
+                                               remote-endpoint = <&apss_funnel_out>;
+                                       };
+                               };
+                       };
+               };
+
+               sdhc_2: sdhci@8804000 {
+                       compatible = "qcom,sc7280-sdhci", "qcom,sdhci-msm-v5";
+                       status = "disabled";
+
+                       reg = <0 0x08804000 0 0x1000>;
+
+                       iommus = <&apps_smmu 0x100 0x0>;
+                       interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "hc_irq", "pwr_irq";
+
+                       clocks = <&gcc GCC_SDCC2_APPS_CLK>,
+                                <&gcc GCC_SDCC2_AHB_CLK>,
+                                <&rpmhcc RPMH_CXO_CLK>;
+                       clock-names = "core", "iface", "xo";
+                       interconnects = <&aggre1_noc MASTER_SDCC_2 0 &mc_virt SLAVE_EBI1 0>,
+                                       <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_SDCC_2 0>;
+                       interconnect-names = "sdhc-ddr","cpu-sdhc";
+                       power-domains = <&rpmhpd SC7280_CX>;
+                       operating-points-v2 = <&sdhc2_opp_table>;
+
+                       bus-width = <4>;
+
+                       qcom,dll-config = <0x0007642c>;
+
+                       sdhc2_opp_table: opp-table {
+                               compatible = "operating-points-v2";
+
+                               opp-100000000 {
+                                       opp-hz = /bits/ 64 <100000000>;
+                                       required-opps = <&rpmhpd_opp_low_svs>;
+                                       opp-peak-kBps = <1800000 400000>;
+                                       opp-avg-kBps = <100000 0>;
+                               };
+
+                               opp-202000000 {
+                                       opp-hz = /bits/ 64 <202000000>;
+                                       required-opps = <&rpmhpd_opp_nom>;
+                                       opp-peak-kBps = <5400000 1600000>;
+                                       opp-avg-kBps = <200000 0>;
+                               };
+                       };
+
+               };
+
+               usb_1_hsphy: phy@88e3000 {
+                       compatible = "qcom,sc7280-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_2_hsphy: phy@88e4000 {
+                       compatible = "qcom,sc7280-usb-hs-phy",
+                                    "qcom,usb-snps-hs-7nm-phy";
+                       reg = <0 0x088e4000 0 0x400>;
+                       status = "disabled";
+                       #phy-cells = <0>;
+
+                       clocks = <&rpmhcc RPMH_CXO_CLK>;
+                       clock-names = "ref";
+
+                       resets = <&gcc GCC_QUSB2PHY_SEC_BCR>;
+               };
+
+               usb_1_qmpphy: phy-wrapper@88e9000 {
+                       compatible = "qcom,sc7280-qmp-usb3-dp-phy",
+                                    "qcom,sm8250-qmp-usb3-dp-phy";
+                       reg = <0 0x088e9000 0 0x200>,
+                             <0 0x088e8000 0 0x40>,
+                             <0 0x088ea000 0 0x200>;
+                       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: usb3-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>;
+                               #clock-cells = <0>;
+                               #phy-cells = <0>;
+                               clocks = <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>;
+                               clock-names = "pipe0";
+                               clock-output-names = "usb3_phy_pipe_clk_src";
+                       };
+
+                       dp_phy: dp-phy@88ea200 {
+                               reg = <0 0x088ea200 0 0x200>,
+                                     <0 0x088ea400 0 0x200>,
+                                     <0 0x088eaa00 0 0x200>,
+                                     <0 0x088ea600 0 0x200>,
+                                     <0 0x088ea800 0 0x200>;
+                               #phy-cells = <0>;
+                               #clock-cells = <1>;
+                       };
+               };
+
+               usb_2: usb@8cf8800 {
+                       compatible = "qcom,sc7280-dwc3", "qcom,dwc3";
+                       reg = <0 0x08cf8800 0 0x400>;
+                       status = "disabled";
+                       #address-cells = <2>;
+                       #size-cells = <2>;
+                       ranges;
+                       dma-ranges;
+
+                       clocks = <&gcc GCC_CFG_NOC_USB3_SEC_AXI_CLK>,
+                                <&gcc GCC_USB30_SEC_MASTER_CLK>,
+                                <&gcc GCC_AGGRE_USB3_SEC_AXI_CLK>,
+                                <&gcc GCC_USB30_SEC_MOCK_UTMI_CLK>,
+                                <&gcc GCC_USB30_SEC_SLEEP_CLK>;
+                       clock-names = "cfg_noc", "core", "iface","mock_utmi",
+                                     "sleep";
+
+                       assigned-clocks = <&gcc GCC_USB30_SEC_MOCK_UTMI_CLK>,
+                                         <&gcc GCC_USB30_SEC_MASTER_CLK>;
+                       assigned-clock-rates = <19200000>, <200000000>;
+
+                       interrupts-extended = <&intc GIC_SPI 240 IRQ_TYPE_LEVEL_HIGH>,
+                                    <&pdc 13 IRQ_TYPE_EDGE_RISING>,
+                                    <&pdc 12 IRQ_TYPE_EDGE_RISING>;
+                       interrupt-names = "hs_phy_irq",
+                                         "dm_hs_phy_irq", "dp_hs_phy_irq";
+
+                       power-domains = <&gcc GCC_USB30_SEC_GDSC>;
+
+                       resets = <&gcc GCC_USB30_SEC_BCR>;
+
+                       interconnects = <&aggre1_noc MASTER_USB2 0 &mc_virt SLAVE_EBI1 0>,
+                                       <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_USB2 0>;
+                       interconnect-names = "usb-ddr", "apps-usb";
+
+                       usb_2_dwc3: usb@8c00000 {
+                               compatible = "snps,dwc3";
+                               reg = <0 0x08c00000 0 0xe000>;
+                               interrupts = <GIC_SPI 242 IRQ_TYPE_LEVEL_HIGH>;
+                               iommus = <&apps_smmu 0xa0 0x0>;
+                               snps,dis_u2_susphy_quirk;
+                               snps,dis_enblslpm_quirk;
+                               phys = <&usb_2_hsphy>;
+                               phy-names = "usb2-phy";
+                               maximum-speed = "high-speed";
+                       };
+               };
+
+               qspi: spi@88dc000 {
+                       compatible = "qcom,sc7280-qspi", "qcom,qspi-v1";
+                       reg = <0 0x088dc000 0 0x1000>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&gcc GCC_QSPI_CNOC_PERIPH_AHB_CLK>,
+                                <&gcc GCC_QSPI_CORE_CLK>;
+                       clock-names = "iface", "core";
+                       interconnects = <&gem_noc MASTER_APPSS_PROC 0
+                                       &cnoc2 SLAVE_QSPI_0 0>;
+                       interconnect-names = "qspi-config";
+                       power-domains = <&rpmhpd SC7280_CX>;
+                       operating-points-v2 = <&qspi_opp_table>;
+                       status = "disabled";
+               };
+
+               dc_noc: interconnect@90e0000 {
+                       reg = <0 0x090e0000 0 0x5080>;
+                       compatible = "qcom,sc7280-dc-noc";
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
+
+               gem_noc: interconnect@9100000 {
+                       reg = <0 0x9100000 0 0xe2200>;
+                       compatible = "qcom,sc7280-gem-noc";
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
+
+               system-cache-controller@9200000 {
+                       compatible = "qcom,sc7280-llcc";
+                       reg = <0 0x09200000 0 0xd0000>, <0 0x09600000 0 0x50000>;
+                       reg-names = "llcc_base", "llcc_broadcast_base";
+                       interrupts = <GIC_SPI 582 IRQ_TYPE_LEVEL_HIGH>;
+               };
+
+               nsp_noc: interconnect@a0c0000 {
+                       reg = <0 0x0a0c0000 0 0x10000>;
+                       compatible = "qcom,sc7280-nsp-noc";
+                       #interconnect-cells = <2>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+               };
+
+               usb_1: usb@a6f8800 {
+                       compatible = "qcom,sc7280-dwc3", "qcom,dwc3";
+                       reg = <0 0x0a6f8800 0 0x400>;
+                       status = "disabled";
+                       #address-cells = <2>;
+                       #size-cells = <2>;
+                       ranges;
+                       dma-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_MOCK_UTMI_CLK>,
+                                <&gcc GCC_USB30_PRIM_SLEEP_CLK>;
+                       clock-names = "cfg_noc", "core", "iface", "mock_utmi",
+                                     "sleep";
+
+                       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 131 IRQ_TYPE_LEVEL_HIGH>,
+                                             <&pdc 14 IRQ_TYPE_EDGE_BOTH>,
+                                             <&pdc 15 IRQ_TYPE_EDGE_BOTH>,
+                                             <&pdc 17 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "hs_phy_irq", "dp_hs_phy_irq",
+                                         "dm_hs_phy_irq", "ss_phy_irq";
+
+                       power-domains = <&gcc GCC_USB30_PRIM_GDSC>;
+
+                       resets = <&gcc GCC_USB30_PRIM_BCR>;
+
+                       interconnects = <&aggre1_noc MASTER_USB3_0 0 &mc_virt SLAVE_EBI1 0>,
+                                       <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_USB3_0 0>;
+                       interconnect-names = "usb-ddr", "apps-usb";
+
+                       usb_1_dwc3: usb@a600000 {
+                               compatible = "snps,dwc3";
+                               reg = <0 0x0a600000 0 0xe000>;
+                               interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
+                               iommus = <&apps_smmu 0xe0 0x0>;
+                               snps,dis_u2_susphy_quirk;
+                               snps,dis_enblslpm_quirk;
+                               phys = <&usb_1_hsphy>, <&usb_1_ssphy>;
+                               phy-names = "usb2-phy", "usb3-phy";
+                               maximum-speed = "super-speed";
+                       };
+               };
+
+               videocc: clock-controller@aaf0000 {
+                       compatible = "qcom,sc7280-videocc";
+                       reg = <0 0xaaf0000 0 0x10000>;
+                       clocks = <&rpmhcc RPMH_CXO_CLK>,
+                               <&rpmhcc RPMH_CXO_CLK_A>;
+                       clock-names = "bi_tcxo", "bi_tcxo_ao";
+                       #clock-cells = <1>;
+                       #reset-cells = <1>;
+                       #power-domain-cells = <1>;
+               };
+
+               dispcc: clock-controller@af00000 {
+                       compatible = "qcom,sc7280-dispcc";
+                       reg = <0 0xaf00000 0 0x20000>;
+                       clocks = <&rpmhcc RPMH_CXO_CLK>,
+                                <&gcc GCC_DISP_GPLL0_CLK_SRC>,
+                                <0>, <0>, <0>, <0>, <0>, <0>;
+                       clock-names = "bi_tcxo", "gcc_disp_gpll0_clk",
+                                     "dsi0_phy_pll_out_byteclk",
+                                     "dsi0_phy_pll_out_dsiclk",
+                                     "dp_phy_pll_link_clk",
+                                     "dp_phy_pll_vco_div_clk",
+                                     "edp_phy_pll_link_clk",
+                                     "edp_phy_pll_vco_div_clk";
+                       #clock-cells = <1>;
+                       #reset-cells = <1>;
+                       #power-domain-cells = <1>;
+               };
+
+               pdc: interrupt-controller@b220000 {
+                       compatible = "qcom,sc7280-pdc", "qcom,pdc";
+                       reg = <0 0x0b220000 0 0x30000>;
+                       qcom,pdc-ranges = <0 480 40>, <40 140 14>, <54 263 1>,
+                                         <55 306 4>, <59 312 3>, <62 374 2>,
+                                         <64 434 2>, <66 438 3>, <69 86 1>,
+                                         <70 520 54>, <124 609 31>, <155 63 1>,
+                                         <156 716 12>;
+                       #interrupt-cells = <2>;
+                       interrupt-parent = <&intc>;
+                       interrupt-controller;
+               };
+
+               pdc_reset: reset-controller@b5e0000 {
+                       compatible = "qcom,sc7280-pdc-global";
+                       reg = <0 0x0b5e0000 0 0x20000>;
+                       #reset-cells = <1>;
+               };
+
+               tsens0: thermal-sensor@c263000 {
+                       compatible = "qcom,sc7280-tsens","qcom,tsens-v2";
+                       reg = <0 0x0c263000 0 0x1ff>, /* TM */
+                               <0 0x0c222000 0 0x1ff>; /* SROT */
+                       #qcom,sensors = <15>;
+                       interrupts = <GIC_SPI 506 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 508 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "uplow","critical";
+                       #thermal-sensor-cells = <1>;
                };
 
-               replicator@6b06000 {
-                       compatible = "arm,coresight-dynamic-replicator", "arm,primecell";
-                       reg = <0 0x06b06000 0 0x1000>;
+               tsens1: thermal-sensor@c265000 {
+                       compatible = "qcom,sc7280-tsens","qcom,tsens-v2";
+                       reg = <0 0x0c265000 0 0x1ff>, /* TM */
+                               <0 0x0c223000 0 0x1ff>; /* SROT */
+                       #qcom,sensors = <12>;
+                       interrupts = <GIC_SPI 507 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 509 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "uplow","critical";
+                       #thermal-sensor-cells = <1>;
+               };
 
-                       clocks = <&aoss_qmp>;
-                       clock-names = "apb_pclk";
-                       qcom,replicator-loses-context;
+               aoss_reset: reset-controller@c2a0000 {
+                       compatible = "qcom,sc7280-aoss-cc", "qcom,sdm845-aoss-cc";
+                       reg = <0 0x0c2a0000 0 0x31000>;
+                       #reset-cells = <1>;
+               };
 
-                       out-ports {
-                               port {
-                                       swao_replicator_out: endpoint {
-                                               remote-endpoint = <&replicator_in>;
-                                       };
-                               };
-                       };
+               aoss_qmp: power-controller@c300000 {
+                       compatible = "qcom,sc7280-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>;
 
-                       in-ports {
-                               port {
-                                       swao_replicator_in: endpoint {
-                                               remote-endpoint = <&etf_out>;
-                                       };
-                               };
-                       };
+                       #clock-cells = <0>;
                };
 
-               etm@7040000 {
-                       compatible = "arm,coresight-etm4x", "arm,primecell";
-                       reg = <0 0x07040000 0 0x1000>;
+               sram@c3f0000 {
+                       compatible = "qcom,rpmh-stats";
+                       reg = <0 0x0c3f0000 0 0x400>;
+               };
 
-                       cpu = <&CPU0>;
+               spmi_bus: spmi@c440000 {
+                       compatible = "qcom,spmi-pmic-arb";
+                       reg = <0 0x0c440000 0 0x1100>,
+                             <0 0x0c600000 0 0x2000000>,
+                             <0 0x0e600000 0 0x100000>,
+                             <0 0x0e700000 0 0xa0000>,
+                             <0 0x0c40a000 0 0x26000>;
+                       reg-names = "core", "chnls", "obsrvr", "intr", "cnfg";
+                       interrupt-names = "periph_irq";
+                       interrupts-extended = <&pdc 1 IRQ_TYPE_LEVEL_HIGH>;
+                       qcom,ee = <0>;
+                       qcom,channel = <0>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       interrupt-controller;
+                       #interrupt-cells = <4>;
+               };
 
-                       clocks = <&aoss_qmp>;
-                       clock-names = "apb_pclk";
-                       arm,coresight-loses-context-with-cpu;
-                       qcom,skip-power-up;
+               tlmm: pinctrl@f100000 {
+                       compatible = "qcom,sc7280-pinctrl";
+                       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 175>;
+                       wakeup-parent = <&pdc>;
 
-                       out-ports {
-                               port {
-                                       etm0_out: endpoint {
-                                               remote-endpoint = <&apss_funnel_in0>;
-                                       };
-                               };
+                       pcie1_clkreq_n: pcie1-clkreq-n {
+                               pins = "gpio79";
+                               function = "pcie1_clkreqn";
+                               drive-strength = <2>;
+                               bias-pull-up;
                        };
-               };
 
-               etm@7140000 {
-                       compatible = "arm,coresight-etm4x", "arm,primecell";
-                       reg = <0 0x07140000 0 0x1000>;
+                       qspi_clk: qspi-clk {
+                               pins = "gpio14";
+                               function = "qspi_clk";
+                       };
 
-                       cpu = <&CPU1>;
+                       qspi_cs0: qspi-cs0 {
+                               pins = "gpio15";
+                               function = "qspi_cs";
+                       };
 
-                       clocks = <&aoss_qmp>;
-                       clock-names = "apb_pclk";
-                       arm,coresight-loses-context-with-cpu;
-                       qcom,skip-power-up;
+                       qspi_cs1: qspi-cs1 {
+                               pins = "gpio19";
+                               function = "qspi_cs";
+                       };
 
-                       out-ports {
-                               port {
-                                       etm1_out: endpoint {
-                                               remote-endpoint = <&apss_funnel_in1>;
-                                       };
-                               };
+                       qspi_data01: qspi-data01 {
+                               pins = "gpio12", "gpio13";
+                               function = "qspi_data";
                        };
-               };
 
-               etm@7240000 {
-                       compatible = "arm,coresight-etm4x", "arm,primecell";
-                       reg = <0 0x07240000 0 0x1000>;
+                       qspi_data12: qspi-data12 {
+                               pins = "gpio16", "gpio17";
+                               function = "qspi_data";
+                       };
 
-                       cpu = <&CPU2>;
+                       qup_i2c0_data_clk: qup-i2c0-data-clk {
+                               pins = "gpio0", "gpio1";
+                               function = "qup00";
+                       };
 
-                       clocks = <&aoss_qmp>;
-                       clock-names = "apb_pclk";
-                       arm,coresight-loses-context-with-cpu;
-                       qcom,skip-power-up;
+                       qup_i2c1_data_clk: qup-i2c1-data-clk {
+                               pins = "gpio4", "gpio5";
+                               function = "qup01";
+                       };
 
-                       out-ports {
-                               port {
-                                       etm2_out: endpoint {
-                                               remote-endpoint = <&apss_funnel_in2>;
-                                       };
-                               };
+                       qup_i2c2_data_clk: qup-i2c2-data-clk {
+                               pins = "gpio8", "gpio9";
+                               function = "qup02";
                        };
-               };
 
-               etm@7340000 {
-                       compatible = "arm,coresight-etm4x", "arm,primecell";
-                       reg = <0 0x07340000 0 0x1000>;
+                       qup_i2c3_data_clk: qup-i2c3-data-clk {
+                               pins = "gpio12", "gpio13";
+                               function = "qup03";
+                       };
 
-                       cpu = <&CPU3>;
+                       qup_i2c4_data_clk: qup-i2c4-data-clk {
+                               pins = "gpio16", "gpio17";
+                               function = "qup04";
+                       };
 
-                       clocks = <&aoss_qmp>;
-                       clock-names = "apb_pclk";
-                       arm,coresight-loses-context-with-cpu;
-                       qcom,skip-power-up;
+                       qup_i2c5_data_clk: qup-i2c5-data-clk {
+                               pins = "gpio20", "gpio21";
+                               function = "qup05";
+                       };
 
-                       out-ports {
-                               port {
-                                       etm3_out: endpoint {
-                                               remote-endpoint = <&apss_funnel_in3>;
-                                       };
-                               };
+                       qup_i2c6_data_clk: qup-i2c6-data-clk {
+                               pins = "gpio24", "gpio25";
+                               function = "qup06";
                        };
-               };
 
-               etm@7440000 {
-                       compatible = "arm,coresight-etm4x", "arm,primecell";
-                       reg = <0 0x07440000 0 0x1000>;
+                       qup_i2c7_data_clk: qup-i2c7-data-clk {
+                               pins = "gpio28", "gpio29";
+                               function = "qup07";
+                       };
 
-                       cpu = <&CPU4>;
+                       qup_i2c8_data_clk: qup-i2c8-data-clk {
+                               pins = "gpio32", "gpio33";
+                               function = "qup10";
+                       };
 
-                       clocks = <&aoss_qmp>;
-                       clock-names = "apb_pclk";
-                       arm,coresight-loses-context-with-cpu;
-                       qcom,skip-power-up;
+                       qup_i2c9_data_clk: qup-i2c9-data-clk {
+                               pins = "gpio36", "gpio37";
+                               function = "qup11";
+                       };
 
-                       out-ports {
-                               port {
-                                       etm4_out: endpoint {
-                                               remote-endpoint = <&apss_funnel_in4>;
-                                       };
-                               };
+                       qup_i2c10_data_clk: qup-i2c10-data-clk {
+                               pins = "gpio40", "gpio41";
+                               function = "qup12";
                        };
-               };
 
-               etm@7540000 {
-                       compatible = "arm,coresight-etm4x", "arm,primecell";
-                       reg = <0 0x07540000 0 0x1000>;
+                       qup_i2c11_data_clk: qup-i2c11-data-clk {
+                               pins = "gpio44", "gpio45";
+                               function = "qup13";
+                       };
 
-                       cpu = <&CPU5>;
+                       qup_i2c12_data_clk: qup-i2c12-data-clk {
+                               pins = "gpio48", "gpio49";
+                               function = "qup14";
+                       };
 
-                       clocks = <&aoss_qmp>;
-                       clock-names = "apb_pclk";
-                       arm,coresight-loses-context-with-cpu;
-                       qcom,skip-power-up;
+                       qup_i2c13_data_clk: qup-i2c13-data-clk {
+                               pins = "gpio52", "gpio53";
+                               function = "qup15";
+                       };
 
-                       out-ports {
-                               port {
-                                       etm5_out: endpoint {
-                                               remote-endpoint = <&apss_funnel_in5>;
-                                       };
-                               };
+                       qup_i2c14_data_clk: qup-i2c14-data-clk {
+                               pins = "gpio56", "gpio57";
+                               function = "qup16";
                        };
-               };
 
-               etm@7640000 {
-                       compatible = "arm,coresight-etm4x", "arm,primecell";
-                       reg = <0 0x07640000 0 0x1000>;
+                       qup_i2c15_data_clk: qup-i2c15-data-clk {
+                               pins = "gpio60", "gpio61";
+                               function = "qup17";
+                       };
 
-                       cpu = <&CPU6>;
+                       qup_spi0_data_clk: qup-spi0-data-clk {
+                               pins = "gpio0", "gpio1", "gpio2";
+                               function = "qup00";
+                       };
 
-                       clocks = <&aoss_qmp>;
-                       clock-names = "apb_pclk";
-                       arm,coresight-loses-context-with-cpu;
-                       qcom,skip-power-up;
+                       qup_spi0_cs: qup-spi0-cs {
+                               pins = "gpio3";
+                               function = "qup00";
+                       };
 
-                       out-ports {
-                               port {
-                                       etm6_out: endpoint {
-                                               remote-endpoint = <&apss_funnel_in6>;
-                                       };
-                               };
+                       qup_spi0_cs_gpio: qup-spi0-cs-gpio {
+                               pins = "gpio3";
+                               function = "gpio";
                        };
-               };
 
-               etm@7740000 {
-                       compatible = "arm,coresight-etm4x", "arm,primecell";
-                       reg = <0 0x07740000 0 0x1000>;
+                       qup_spi1_data_clk: qup-spi1-data-clk {
+                               pins = "gpio4", "gpio5", "gpio6";
+                               function = "qup01";
+                       };
 
-                       cpu = <&CPU7>;
+                       qup_spi1_cs: qup-spi1-cs {
+                               pins = "gpio7";
+                               function = "qup01";
+                       };
 
-                       clocks = <&aoss_qmp>;
-                       clock-names = "apb_pclk";
-                       arm,coresight-loses-context-with-cpu;
-                       qcom,skip-power-up;
+                       qup_spi1_cs_gpio: qup-spi1-cs-gpio {
+                               pins = "gpio7";
+                               function = "gpio";
+                       };
 
-                       out-ports {
-                               port {
-                                       etm7_out: endpoint {
-                                               remote-endpoint = <&apss_funnel_in7>;
-                                       };
-                               };
+                       qup_spi2_data_clk: qup-spi2-data-clk {
+                               pins = "gpio8", "gpio9", "gpio10";
+                               function = "qup02";
                        };
-               };
 
-               funnel@7800000 { /* APSS Funnel */
-                       compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
-                       reg = <0 0x07800000 0 0x1000>;
+                       qup_spi2_cs: qup-spi2-cs {
+                               pins = "gpio11";
+                               function = "qup02";
+                       };
 
-                       clocks = <&aoss_qmp>;
-                       clock-names = "apb_pclk";
+                       qup_spi2_cs_gpio: qup-spi2-cs-gpio {
+                               pins = "gpio11";
+                               function = "gpio";
+                       };
 
-                       out-ports {
-                               port {
-                                       apss_funnel_out: endpoint {
-                                               remote-endpoint = <&apss_merge_funnel_in>;
-                                       };
-                               };
+                       qup_spi3_data_clk: qup-spi3-data-clk {
+                               pins = "gpio12", "gpio13", "gpio14";
+                               function = "qup03";
                        };
 
-                       in-ports {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
+                       qup_spi3_cs: qup-spi3-cs {
+                               pins = "gpio15";
+                               function = "qup03";
+                       };
 
-                               port@0 {
-                                       reg = <0>;
-                                       apss_funnel_in0: endpoint {
-                                               remote-endpoint = <&etm0_out>;
-                                       };
-                               };
+                       qup_spi3_cs_gpio: qup-spi3-cs-gpio {
+                               pins = "gpio15";
+                               function = "gpio";
+                       };
 
-                               port@1 {
-                                       reg = <1>;
-                                       apss_funnel_in1: endpoint {
-                                               remote-endpoint = <&etm1_out>;
-                                       };
-                               };
+                       qup_spi4_data_clk: qup-spi4-data-clk {
+                               pins = "gpio16", "gpio17", "gpio18";
+                               function = "qup04";
+                       };
 
-                               port@2 {
-                                       reg = <2>;
-                                       apss_funnel_in2: endpoint {
-                                               remote-endpoint = <&etm2_out>;
-                                       };
-                               };
+                       qup_spi4_cs: qup-spi4-cs {
+                               pins = "gpio19";
+                               function = "qup04";
+                       };
+
+                       qup_spi4_cs_gpio: qup-spi4-cs-gpio {
+                               pins = "gpio19";
+                               function = "gpio";
+                       };
 
-                               port@3 {
-                                       reg = <3>;
-                                       apss_funnel_in3: endpoint {
-                                               remote-endpoint = <&etm3_out>;
-                                       };
-                               };
+                       qup_spi5_data_clk: qup-spi5-data-clk {
+                               pins = "gpio20", "gpio21", "gpio22";
+                               function = "qup05";
+                       };
 
-                               port@4 {
-                                       reg = <4>;
-                                       apss_funnel_in4: endpoint {
-                                               remote-endpoint = <&etm4_out>;
-                                       };
-                               };
+                       qup_spi5_cs: qup-spi5-cs {
+                               pins = "gpio23";
+                               function = "qup05";
+                       };
 
-                               port@5 {
-                                       reg = <5>;
-                                       apss_funnel_in5: endpoint {
-                                               remote-endpoint = <&etm5_out>;
-                                       };
-                               };
+                       qup_spi5_cs_gpio: qup-spi5-cs-gpio {
+                               pins = "gpio23";
+                               function = "gpio";
+                       };
 
-                               port@6 {
-                                       reg = <6>;
-                                       apss_funnel_in6: endpoint {
-                                               remote-endpoint = <&etm6_out>;
-                                       };
-                               };
+                       qup_spi6_data_clk: qup-spi6-data-clk {
+                               pins = "gpio24", "gpio25", "gpio26";
+                               function = "qup06";
+                       };
 
-                               port@7 {
-                                       reg = <7>;
-                                       apss_funnel_in7: endpoint {
-                                               remote-endpoint = <&etm7_out>;
-                                       };
-                               };
+                       qup_spi6_cs: qup-spi6-cs {
+                               pins = "gpio27";
+                               function = "qup06";
                        };
-               };
 
-               funnel@7810000 {
-                       compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
-                       reg = <0 0x07810000 0 0x1000>;
+                       qup_spi6_cs_gpio: qup-spi6-cs-gpio {
+                               pins = "gpio27";
+                               function = "gpio";
+                       };
 
-                       clocks = <&aoss_qmp>;
-                       clock-names = "apb_pclk";
+                       qup_spi7_data_clk: qup-spi7-data-clk {
+                               pins = "gpio28", "gpio29", "gpio30";
+                               function = "qup07";
+                       };
 
-                       out-ports {
-                               port {
-                                       apss_merge_funnel_out: endpoint {
-                                               remote-endpoint = <&funnel1_in4>;
-                                       };
-                               };
+                       qup_spi7_cs: qup-spi7-cs {
+                               pins = "gpio31";
+                               function = "qup07";
                        };
 
-                       in-ports {
-                               port {
-                                       apss_merge_funnel_in: endpoint {
-                                               remote-endpoint = <&apss_funnel_out>;
-                                       };
-                               };
+                       qup_spi7_cs_gpio: qup-spi7-cs-gpio {
+                               pins = "gpio31";
+                               function = "gpio";
                        };
-               };
 
-               sdhc_2: sdhci@8804000 {
-                       compatible = "qcom,sc7280-sdhci", "qcom,sdhci-msm-v5";
-                       status = "disabled";
+                       qup_spi8_data_clk: qup-spi8-data-clk {
+                               pins = "gpio32", "gpio33", "gpio34";
+                               function = "qup10";
+                       };
 
-                       reg = <0 0x08804000 0 0x1000>;
+                       qup_spi8_cs: qup-spi8-cs {
+                               pins = "gpio35";
+                               function = "qup10";
+                       };
 
-                       iommus = <&apps_smmu 0x100 0x0>;
-                       interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-names = "hc_irq", "pwr_irq";
+                       qup_spi8_cs_gpio: qup-spi8-cs-gpio {
+                               pins = "gpio35";
+                               function = "gpio";
+                       };
 
-                       clocks = <&gcc GCC_SDCC2_APPS_CLK>,
-                                <&gcc GCC_SDCC2_AHB_CLK>,
-                                <&rpmhcc RPMH_CXO_CLK>;
-                       clock-names = "core", "iface", "xo";
-                       interconnects = <&aggre1_noc MASTER_SDCC_2 0 &mc_virt SLAVE_EBI1 0>,
-                                       <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_SDCC_2 0>;
-                       interconnect-names = "sdhc-ddr","cpu-sdhc";
-                       power-domains = <&rpmhpd SC7280_CX>;
-                       operating-points-v2 = <&sdhc2_opp_table>;
+                       qup_spi9_data_clk: qup-spi9-data-clk {
+                               pins = "gpio36", "gpio37", "gpio38";
+                               function = "qup11";
+                       };
 
-                       bus-width = <4>;
+                       qup_spi9_cs: qup-spi9-cs {
+                               pins = "gpio39";
+                               function = "qup11";
+                       };
 
-                       qcom,dll-config = <0x0007642c>;
+                       qup_spi9_cs_gpio: qup-spi9-cs-gpio {
+                               pins = "gpio39";
+                               function = "gpio";
+                       };
 
-                       sdhc2_opp_table: opp-table {
-                               compatible = "operating-points-v2";
+                       qup_spi10_data_clk: qup-spi10-data-clk {
+                               pins = "gpio40", "gpio41", "gpio42";
+                               function = "qup12";
+                       };
 
-                               opp-100000000 {
-                                       opp-hz = /bits/ 64 <100000000>;
-                                       required-opps = <&rpmhpd_opp_low_svs>;
-                                       opp-peak-kBps = <1800000 400000>;
-                                       opp-avg-kBps = <100000 0>;
-                               };
+                       qup_spi10_cs: qup-spi10-cs {
+                               pins = "gpio43";
+                               function = "qup12";
+                       };
 
-                               opp-202000000 {
-                                       opp-hz = /bits/ 64 <202000000>;
-                                       required-opps = <&rpmhpd_opp_nom>;
-                                       opp-peak-kBps = <5400000 1600000>;
-                                       opp-avg-kBps = <200000 0>;
-                               };
+                       qup_spi10_cs_gpio: qup-spi10-cs-gpio {
+                               pins = "gpio43";
+                               function = "gpio";
                        };
 
-               };
+                       qup_spi11_data_clk: qup-spi11-data-clk {
+                               pins = "gpio44", "gpio45", "gpio46";
+                               function = "qup13";
+                       };
 
-               usb_1_hsphy: phy@88e3000 {
-                       compatible = "qcom,sc7280-usb-hs-phy",
-                                    "qcom,usb-snps-hs-7nm-phy";
-                       reg = <0 0x088e3000 0 0x400>;
-                       status = "disabled";
-                       #phy-cells = <0>;
+                       qup_spi11_cs: qup-spi11-cs {
+                               pins = "gpio47";
+                               function = "qup13";
+                       };
 
-                       clocks = <&rpmhcc RPMH_CXO_CLK>;
-                       clock-names = "ref";
+                       qup_spi11_cs_gpio: qup-spi11-cs-gpio {
+                               pins = "gpio47";
+                               function = "gpio";
+                       };
 
-                       resets = <&gcc GCC_QUSB2PHY_PRIM_BCR>;
-               };
+                       qup_spi12_data_clk: qup-spi12-data-clk {
+                               pins = "gpio48", "gpio49", "gpio50";
+                               function = "qup14";
+                       };
 
-               usb_2_hsphy: phy@88e4000 {
-                       compatible = "qcom,sc7280-usb-hs-phy",
-                                    "qcom,usb-snps-hs-7nm-phy";
-                       reg = <0 0x088e4000 0 0x400>;
-                       status = "disabled";
-                       #phy-cells = <0>;
+                       qup_spi12_cs: qup-spi12-cs {
+                               pins = "gpio51";
+                               function = "qup14";
+                       };
 
-                       clocks = <&rpmhcc RPMH_CXO_CLK>;
-                       clock-names = "ref";
+                       qup_spi12_cs_gpio: qup-spi12-cs-gpio {
+                               pins = "gpio51";
+                               function = "gpio";
+                       };
 
-                       resets = <&gcc GCC_QUSB2PHY_SEC_BCR>;
-               };
+                       qup_spi13_data_clk: qup-spi13-data-clk {
+                               pins = "gpio52", "gpio53", "gpio54";
+                               function = "qup15";
+                       };
 
-               usb_1_qmpphy: phy-wrapper@88e9000 {
-                       compatible = "qcom,sc7280-qmp-usb3-dp-phy",
-                                    "qcom,sm8250-qmp-usb3-dp-phy";
-                       reg = <0 0x088e9000 0 0x200>,
-                             <0 0x088e8000 0 0x40>,
-                             <0 0x088ea000 0 0x200>;
-                       status = "disabled";
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges;
+                       qup_spi13_cs: qup-spi13-cs {
+                               pins = "gpio55";
+                               function = "qup15";
+                       };
 
-                       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";
+                       qup_spi13_cs_gpio: qup-spi13-cs-gpio {
+                               pins = "gpio55";
+                               function = "gpio";
+                       };
 
-                       resets = <&gcc GCC_USB3_DP_PHY_PRIM_BCR>,
-                                <&gcc GCC_USB3_PHY_PRIM_BCR>;
-                       reset-names = "phy", "common";
+                       qup_spi14_data_clk: qup-spi14-data-clk {
+                               pins = "gpio56", "gpio57", "gpio58";
+                               function = "qup16";
+                       };
 
-                       usb_1_ssphy: usb3-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>;
-                               #clock-cells = <0>;
-                               #phy-cells = <0>;
-                               clocks = <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>;
-                               clock-names = "pipe0";
-                               clock-output-names = "usb3_phy_pipe_clk_src";
+                       qup_spi14_cs: qup-spi14-cs {
+                               pins = "gpio59";
+                               function = "qup16";
                        };
 
-                       dp_phy: dp-phy@88ea200 {
-                               reg = <0 0x088ea200 0 0x200>,
-                                     <0 0x088ea400 0 0x200>,
-                                     <0 0x088eac00 0 0x400>,
-                                     <0 0x088ea600 0 0x200>,
-                                     <0 0x088ea800 0 0x200>,
-                                     <0 0x088eaa00 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";
+                       qup_spi14_cs_gpio: qup-spi14-cs-gpio {
+                               pins = "gpio59";
+                               function = "gpio";
                        };
-               };
 
-               usb_2: usb@8cf8800 {
-                       compatible = "qcom,sc7280-dwc3", "qcom,dwc3";
-                       reg = <0 0x08cf8800 0 0x400>;
-                       status = "disabled";
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges;
-                       dma-ranges;
+                       qup_spi15_data_clk: qup-spi15-data-clk {
+                               pins = "gpio60", "gpio61", "gpio62";
+                               function = "qup17";
+                       };
 
-                       clocks = <&gcc GCC_CFG_NOC_USB3_SEC_AXI_CLK>,
-                                <&gcc GCC_USB30_SEC_MASTER_CLK>,
-                                <&gcc GCC_AGGRE_USB3_SEC_AXI_CLK>,
-                                <&gcc GCC_USB30_SEC_MOCK_UTMI_CLK>,
-                                <&gcc GCC_USB30_SEC_SLEEP_CLK>;
-                       clock-names = "cfg_noc", "core", "iface","mock_utmi",
-                                     "sleep";
+                       qup_spi15_cs: qup-spi15-cs {
+                               pins = "gpio63";
+                               function = "qup17";
+                       };
 
-                       assigned-clocks = <&gcc GCC_USB30_SEC_MOCK_UTMI_CLK>,
-                                         <&gcc GCC_USB30_SEC_MASTER_CLK>;
-                       assigned-clock-rates = <19200000>, <200000000>;
+                       qup_spi15_cs_gpio: qup-spi15-cs-gpio {
+                               pins = "gpio63";
+                               function = "gpio";
+                       };
 
-                       interrupts-extended = <&intc GIC_SPI 240 IRQ_TYPE_LEVEL_HIGH>,
-                                    <&pdc 13 IRQ_TYPE_EDGE_RISING>,
-                                    <&pdc 12 IRQ_TYPE_EDGE_RISING>;
-                       interrupt-names = "hs_phy_irq",
-                                         "dm_hs_phy_irq", "dp_hs_phy_irq";
+                       qup_uart0_cts: qup-uart0-cts {
+                               pins = "gpio0";
+                               function = "qup00";
+                       };
 
-                       power-domains = <&gcc GCC_USB30_SEC_GDSC>;
+                       qup_uart0_rts: qup-uart0-rts {
+                               pins = "gpio1";
+                               function = "qup00";
+                       };
 
-                       resets = <&gcc GCC_USB30_SEC_BCR>;
+                       qup_uart0_tx: qup-uart0-tx {
+                               pins = "gpio2";
+                               function = "qup00";
+                       };
 
-                       interconnects = <&aggre1_noc MASTER_USB2 0 &mc_virt SLAVE_EBI1 0>,
-                                       <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_USB2 0>;
-                       interconnect-names = "usb-ddr", "apps-usb";
+                       qup_uart0_rx: qup-uart0-rx {
+                               pins = "gpio3";
+                               function = "qup00";
+                       };
 
-                       usb_2_dwc3: usb@8c00000 {
-                               compatible = "snps,dwc3";
-                               reg = <0 0x08c00000 0 0xe000>;
-                               interrupts = <GIC_SPI 242 IRQ_TYPE_LEVEL_HIGH>;
-                               iommus = <&apps_smmu 0xa0 0x0>;
-                               snps,dis_u2_susphy_quirk;
-                               snps,dis_enblslpm_quirk;
-                               phys = <&usb_2_hsphy>;
-                               phy-names = "usb2-phy";
-                               maximum-speed = "high-speed";
+                       qup_uart1_cts: qup-uart1-cts {
+                               pins = "gpio4";
+                               function = "qup01";
                        };
-               };
 
-               dc_noc: interconnect@90e0000 {
-                       reg = <0 0x090e0000 0 0x5080>;
-                       compatible = "qcom,sc7280-dc-noc";
-                       #interconnect-cells = <2>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
-               };
+                       qup_uart1_rts: qup-uart1-rts {
+                               pins = "gpio5";
+                               function = "qup01";
+                       };
 
-               gem_noc: interconnect@9100000 {
-                       reg = <0 0x9100000 0 0xe2200>;
-                       compatible = "qcom,sc7280-gem-noc";
-                       #interconnect-cells = <2>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
-               };
+                       qup_uart1_tx: qup-uart1-tx {
+                               pins = "gpio6";
+                               function = "qup01";
+                       };
 
-               system-cache-controller@9200000 {
-                       compatible = "qcom,sc7280-llcc";
-                       reg = <0 0x09200000 0 0xd0000>, <0 0x09600000 0 0x50000>;
-                       reg-names = "llcc_base", "llcc_broadcast_base";
-                       interrupts = <GIC_SPI 582 IRQ_TYPE_LEVEL_HIGH>;
-               };
+                       qup_uart1_rx: qup-uart1-rx {
+                               pins = "gpio7";
+                               function = "qup01";
+                       };
 
-               nsp_noc: interconnect@a0c0000 {
-                       reg = <0 0x0a0c0000 0 0x10000>;
-                       compatible = "qcom,sc7280-nsp-noc";
-                       #interconnect-cells = <2>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
-               };
+                       qup_uart2_cts: qup-uart2-cts {
+                               pins = "gpio8";
+                               function = "qup02";
+                       };
 
-               usb_1: usb@a6f8800 {
-                       compatible = "qcom,sc7280-dwc3", "qcom,dwc3";
-                       reg = <0 0x0a6f8800 0 0x400>;
-                       status = "disabled";
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges;
-                       dma-ranges;
+                       qup_uart2_rts: qup-uart2-rts {
+                               pins = "gpio9";
+                               function = "qup02";
+                       };
+
+                       qup_uart2_tx: qup-uart2-tx {
+                               pins = "gpio10";
+                               function = "qup02";
+                       };
+
+                       qup_uart2_rx: qup-uart2-rx {
+                               pins = "gpio11";
+                               function = "qup02";
+                       };
 
-                       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_MOCK_UTMI_CLK>,
-                                <&gcc GCC_USB30_PRIM_SLEEP_CLK>;
-                       clock-names = "cfg_noc", "core", "iface", "mock_utmi",
-                                     "sleep";
+                       qup_uart3_cts: qup-uart3-cts {
+                               pins = "gpio12";
+                               function = "qup03";
+                       };
 
-                       assigned-clocks = <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>,
-                                         <&gcc GCC_USB30_PRIM_MASTER_CLK>;
-                       assigned-clock-rates = <19200000>, <200000000>;
+                       qup_uart3_rts: qup-uart3-rts {
+                               pins = "gpio13";
+                               function = "qup03";
+                       };
 
-                       interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
-                                             <&pdc 14 IRQ_TYPE_EDGE_BOTH>,
-                                             <&pdc 15 IRQ_TYPE_EDGE_BOTH>,
-                                             <&pdc 17 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-names = "hs_phy_irq", "dp_hs_phy_irq",
-                                         "dm_hs_phy_irq", "ss_phy_irq";
+                       qup_uart3_tx: qup-uart3-tx {
+                               pins = "gpio14";
+                               function = "qup03";
+                       };
 
-                       power-domains = <&gcc GCC_USB30_PRIM_GDSC>;
+                       qup_uart3_rx: qup-uart3-rx {
+                               pins = "gpio15";
+                               function = "qup03";
+                       };
 
-                       resets = <&gcc GCC_USB30_PRIM_BCR>;
+                       qup_uart4_cts: qup-uart4-cts {
+                               pins = "gpio16";
+                               function = "qup04";
+                       };
 
-                       interconnects = <&aggre1_noc MASTER_USB3_0 0 &mc_virt SLAVE_EBI1 0>,
-                                       <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_USB3_0 0>;
-                       interconnect-names = "usb-ddr", "apps-usb";
+                       qup_uart4_rts: qup-uart4-rts {
+                               pins = "gpio17";
+                               function = "qup04";
+                       };
 
-                       usb_1_dwc3: usb@a600000 {
-                               compatible = "snps,dwc3";
-                               reg = <0 0x0a600000 0 0xe000>;
-                               interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
-                               iommus = <&apps_smmu 0xe0 0x0>;
-                               snps,dis_u2_susphy_quirk;
-                               snps,dis_enblslpm_quirk;
-                               phys = <&usb_1_hsphy>, <&usb_1_ssphy>;
-                               phy-names = "usb2-phy", "usb3-phy";
-                               maximum-speed = "super-speed";
+                       qup_uart4_tx: qup-uart4-tx {
+                               pins = "gpio18";
+                               function = "qup04";
                        };
-               };
 
-               videocc: clock-controller@aaf0000 {
-                       compatible = "qcom,sc7280-videocc";
-                       reg = <0 0xaaf0000 0 0x10000>;
-                       clocks = <&rpmhcc RPMH_CXO_CLK>,
-                               <&rpmhcc RPMH_CXO_CLK_A>;
-                       clock-names = "bi_tcxo", "bi_tcxo_ao";
-                       #clock-cells = <1>;
-                       #reset-cells = <1>;
-                       #power-domain-cells = <1>;
-               };
+                       qup_uart4_rx: qup-uart4-rx {
+                               pins = "gpio19";
+                               function = "qup04";
+                       };
 
-               dispcc: clock-controller@af00000 {
-                       compatible = "qcom,sc7280-dispcc";
-                       reg = <0 0xaf00000 0 0x20000>;
-                       clocks = <&rpmhcc RPMH_CXO_CLK>,
-                                <&gcc GCC_DISP_GPLL0_CLK_SRC>,
-                                <0>, <0>, <0>, <0>, <0>, <0>;
-                       clock-names = "bi_tcxo", "gcc_disp_gpll0_clk",
-                                     "dsi0_phy_pll_out_byteclk",
-                                     "dsi0_phy_pll_out_dsiclk",
-                                     "dp_phy_pll_link_clk",
-                                     "dp_phy_pll_vco_div_clk",
-                                     "edp_phy_pll_link_clk",
-                                     "edp_phy_pll_vco_div_clk";
-                       #clock-cells = <1>;
-                       #reset-cells = <1>;
-                       #power-domain-cells = <1>;
-               };
+                       qup_uart5_cts: qup-uart5-cts {
+                               pins = "gpio20";
+                               function = "qup05";
+                       };
 
-               pdc: interrupt-controller@b220000 {
-                       compatible = "qcom,sc7280-pdc", "qcom,pdc";
-                       reg = <0 0x0b220000 0 0x30000>;
-                       qcom,pdc-ranges = <0 480 40>, <40 140 14>, <54 263 1>,
-                                         <55 306 4>, <59 312 3>, <62 374 2>,
-                                         <64 434 2>, <66 438 3>, <69 86 1>,
-                                         <70 520 54>, <124 609 31>, <155 63 1>,
-                                         <156 716 12>;
-                       #interrupt-cells = <2>;
-                       interrupt-parent = <&intc>;
-                       interrupt-controller;
-               };
+                       qup_uart5_rts: qup-uart5-rts {
+                               pins = "gpio21";
+                               function = "qup05";
+                       };
 
-               pdc_reset: reset-controller@b5e0000 {
-                       compatible = "qcom,sc7280-pdc-global";
-                       reg = <0 0x0b5e0000 0 0x20000>;
-                       #reset-cells = <1>;
-               };
+                       qup_uart5_tx: qup-uart5-tx {
+                               pins = "gpio22";
+                               function = "qup05";
+                       };
 
-               tsens0: thermal-sensor@c263000 {
-                       compatible = "qcom,sc7280-tsens","qcom,tsens-v2";
-                       reg = <0 0x0c263000 0 0x1ff>, /* TM */
-                               <0 0x0c222000 0 0x1ff>; /* SROT */
-                       #qcom,sensors = <15>;
-                       interrupts = <GIC_SPI 506 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 508 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-names = "uplow","critical";
-                       #thermal-sensor-cells = <1>;
-               };
+                       qup_uart5_rx: qup-uart5-rx {
+                               pins = "gpio23";
+                               function = "qup05";
+                       };
 
-               tsens1: thermal-sensor@c265000 {
-                       compatible = "qcom,sc7280-tsens","qcom,tsens-v2";
-                       reg = <0 0x0c265000 0 0x1ff>, /* TM */
-                               <0 0x0c223000 0 0x1ff>; /* SROT */
-                       #qcom,sensors = <12>;
-                       interrupts = <GIC_SPI 507 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 509 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-names = "uplow","critical";
-                       #thermal-sensor-cells = <1>;
-               };
+                       qup_uart6_cts: qup-uart6-cts {
+                               pins = "gpio24";
+                               function = "qup06";
+                       };
 
-               aoss_reset: reset-controller@c2a0000 {
-                       compatible = "qcom,sc7280-aoss-cc", "qcom,sdm845-aoss-cc";
-                       reg = <0 0x0c2a0000 0 0x31000>;
-                       #reset-cells = <1>;
-               };
+                       qup_uart6_rts: qup-uart6-rts {
+                               pins = "gpio25";
+                               function = "qup06";
+                       };
 
-               aoss_qmp: power-controller@c300000 {
-                       compatible = "qcom,sc7280-aoss-qmp";
-                       reg = <0 0x0c300000 0 0x100000>;
-                       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>;
+                       qup_uart6_tx: qup-uart6-tx {
+                               pins = "gpio26";
+                               function = "qup06";
+                       };
 
-                       #clock-cells = <0>;
-                       #power-domain-cells = <1>;
-               };
+                       qup_uart6_rx: qup-uart6-rx {
+                               pins = "gpio27";
+                               function = "qup06";
+                       };
 
-               spmi_bus: spmi@c440000 {
-                       compatible = "qcom,spmi-pmic-arb";
-                       reg = <0 0x0c440000 0 0x1100>,
-                             <0 0x0c600000 0 0x2000000>,
-                             <0 0x0e600000 0 0x100000>,
-                             <0 0x0e700000 0 0xa0000>,
-                             <0 0x0c40a000 0 0x26000>;
-                       reg-names = "core", "chnls", "obsrvr", "intr", "cnfg";
-                       interrupt-names = "periph_irq";
-                       interrupts-extended = <&pdc 1 IRQ_TYPE_LEVEL_HIGH>;
-                       qcom,ee = <0>;
-                       qcom,channel = <0>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       interrupt-controller;
-                       #interrupt-cells = <4>;
-               };
+                       qup_uart7_cts: qup-uart7-cts {
+                               pins = "gpio28";
+                               function = "qup07";
+                       };
 
-               tlmm: pinctrl@f100000 {
-                       compatible = "qcom,sc7280-pinctrl";
-                       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 175>;
-                       wakeup-parent = <&pdc>;
+                       qup_uart7_rts: qup-uart7-rts {
+                               pins = "gpio29";
+                               function = "qup07";
+                       };
 
-                       qup_uart5_default: qup-uart5-default {
-                               pins = "gpio46", "gpio47";
-                               function = "qup13";
+                       qup_uart7_tx: qup-uart7-tx {
+                               pins = "gpio30";
+                               function = "qup07";
+                       };
+
+                       qup_uart7_rx: qup-uart7-rx {
+                               pins = "gpio31";
+                               function = "qup07";
                        };
 
                        sdc1_on: sdc1-on {
                                data {
                                        pins = "sdc2_data";
                                };
-
-                               sd-cd {
-                                       pins = "gpio91";
-                               };
                        };
 
                        sdc2_off: sdc2-off {
                                        bias-bus-hold;
                                };
                        };
+
+                       qup_uart8_cts: qup-uart8-cts {
+                               pins = "gpio32";
+                               function = "qup10";
+                       };
+
+                       qup_uart8_rts: qup-uart8-rts {
+                               pins = "gpio33";
+                               function = "qup10";
+                       };
+
+                       qup_uart8_tx: qup-uart8-tx {
+                               pins = "gpio34";
+                               function = "qup10";
+                       };
+
+                       qup_uart8_rx: qup-uart8-rx {
+                               pins = "gpio35";
+                               function = "qup10";
+                       };
+
+                       qup_uart9_cts: qup-uart9-cts {
+                               pins = "gpio36";
+                               function = "qup11";
+                       };
+
+                       qup_uart9_rts: qup-uart9-rts {
+                               pins = "gpio37";
+                               function = "qup11";
+                       };
+
+                       qup_uart9_tx: qup-uart9-tx {
+                               pins = "gpio38";
+                               function = "qup11";
+                       };
+
+                       qup_uart9_rx: qup-uart9-rx {
+                               pins = "gpio39";
+                               function = "qup11";
+                       };
+
+                       qup_uart10_cts: qup-uart10-cts {
+                               pins = "gpio40";
+                               function = "qup12";
+                       };
+
+                       qup_uart10_rts: qup-uart10-rts {
+                               pins = "gpio41";
+                               function = "qup12";
+                       };
+
+                       qup_uart10_tx: qup-uart10-tx {
+                               pins = "gpio42";
+                               function = "qup12";
+                       };
+
+                       qup_uart10_rx: qup-uart10-rx {
+                               pins = "gpio43";
+                               function = "qup12";
+                       };
+
+                       qup_uart11_cts: qup-uart11-cts {
+                               pins = "gpio44";
+                               function = "qup13";
+                       };
+
+                       qup_uart11_rts: qup-uart11-rts {
+                               pins = "gpio45";
+                               function = "qup13";
+                       };
+
+                       qup_uart11_tx: qup-uart11-tx {
+                               pins = "gpio46";
+                               function = "qup13";
+                       };
+
+                       qup_uart11_rx: qup-uart11-rx {
+                               pins = "gpio47";
+                               function = "qup13";
+                       };
+
+                       qup_uart12_cts: qup-uart12-cts {
+                               pins = "gpio48";
+                               function = "qup14";
+                       };
+
+                       qup_uart12_rts: qup-uart12-rts {
+                               pins = "gpio49";
+                               function = "qup14";
+                       };
+
+                       qup_uart12_tx: qup-uart12-tx {
+                               pins = "gpio50";
+                               function = "qup14";
+                       };
+
+                       qup_uart12_rx: qup-uart12-rx {
+                               pins = "gpio51";
+                               function = "qup14";
+                       };
+
+                       qup_uart13_cts: qup-uart13-cts {
+                               pins = "gpio52";
+                               function = "qup15";
+                       };
+
+                       qup_uart13_rts: qup-uart13-rts {
+                               pins = "gpio53";
+                               function = "qup15";
+                       };
+
+                       qup_uart13_tx: qup-uart13-tx {
+                               pins = "gpio54";
+                               function = "qup15";
+                       };
+
+                       qup_uart13_rx: qup-uart13-rx {
+                               pins = "gpio55";
+                               function = "qup15";
+                       };
+
+                       qup_uart14_cts: qup-uart14-cts {
+                               pins = "gpio56";
+                               function = "qup16";
+                       };
+
+                       qup_uart14_rts: qup-uart14-rts {
+                               pins = "gpio57";
+                               function = "qup16";
+                       };
+
+                       qup_uart14_tx: qup-uart14-tx {
+                               pins = "gpio58";
+                               function = "qup16";
+                       };
+
+                       qup_uart14_rx: qup-uart14-rx {
+                               pins = "gpio59";
+                               function = "qup16";
+                       };
+
+                       qup_uart15_cts: qup-uart15-cts {
+                               pins = "gpio60";
+                               function = "qup17";
+                       };
+
+                       qup_uart15_rts: qup-uart15-rts {
+                               pins = "gpio61";
+                               function = "qup17";
+                       };
+
+                       qup_uart15_tx: qup-uart15-tx {
+                               pins = "gpio62";
+                               function = "qup17";
+                       };
+
+                       qup_uart15_rx: qup-uart15-rx {
+                               pins = "gpio63";
+                               function = "qup17";
+                       };
+               };
+
+               imem@146a5000 {
+                       compatible = "qcom,sc7280-imem", "syscon";
+                       reg = <0 0x146a5000 0 0x6000>;
+
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       ranges = <0 0 0x146a5000 0x6000>;
+
+                       pil-reloc@594c {
+                               compatible = "qcom,pil-reloc-info";
+                               reg = <0x594c 0xc8>;
+                       };
                };
 
                apps_smmu: iommu@15000000 {
                };
 
                gpuss0-thermal {
-                       polling-delay-passive = <0>;
+                       polling-delay-passive = <100>;
                        polling-delay = <0>;
 
                        thermal-sensors = <&tsens1 1>;
 
                        trips {
                                gpuss0_alert0: trip-point0 {
-                                       temperature = <90000>;
+                                       temperature = <95000>;
                                        hysteresis = <2000>;
-                                       type = "hot";
+                                       type = "passive";
                                };
 
                                gpuss0_crit: gpuss0-crit {
                                        type = "critical";
                                };
                        };
+
+                       cooling-maps {
+                               map0 {
+                                       trip = <&gpuss0_alert0>;
+                                       cooling-device = <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+                               };
+                       };
                };
 
                gpuss1-thermal {
-                       polling-delay-passive = <0>;
+                       polling-delay-passive = <100>;
                        polling-delay = <0>;
 
                        thermal-sensors = <&tsens1 2>;
 
                        trips {
                                gpuss1_alert0: trip-point0 {
-                                       temperature = <90000>;
+                                       temperature = <95000>;
                                        hysteresis = <2000>;
-                                       type = "hot";
+                                       type = "passive";
                                };
 
                                gpuss1_crit: gpuss1-crit {
                                        type = "critical";
                                };
                        };
+
+                       cooling-maps {
+                               map0 {
+                                       trip = <&gpuss1_alert0>;
+                                       cooling-device = <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+                               };
+                       };
                };
 
                nspss0-thermal {