]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge branch '20260416-qcom_ice_power_and_clk_vote-v5-13-5ccf5d7e2846@oss.qualcomm...
authorBjorn Andersson <andersson@kernel.org>
Thu, 21 May 2026 21:31:44 +0000 (16:31 -0500)
committerBjorn Andersson <andersson@kernel.org>
Thu, 21 May 2026 21:33:29 +0000 (16:33 -0500)
Merge the two fixes for ICC blocks in Milos and Eliza through a topic
branch, in order to resolve the introduced DT validation errors in
v7.1-rc while avoiding the merge conflicts against arm64-for-7.2.

Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1  2 
arch/arm64/boot/dts/qcom/eliza.dtsi
arch/arm64/boot/dts/qcom/milos.dtsi

index efac6cb6bb3b12db330504f04c1ed7955e147710,7e97361a5dc58c1b9c28dedd7293024e4a7bb1e8..977de44b816e4295dba89ecb77c6df60f6f08d15
  
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
 -                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
 -                                               &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ALWAYS>;
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt  SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
 -                                                   "qup-config";
 +                                                   "qup-config",
 +                                                   "qup-memory";
 +
 +                              dmas = <&gpi_dma2 0 0 QCOM_GPI_I2C>,
 +                                     <&gpi_dma2 1 0 QCOM_GPI_I2C>;
 +                              dma-names = "tx",
 +                                          "rx";
  
 -                              pinctrl-0 = <&qup_uart14_default>;
 +                              pinctrl-0 = <&qup_i2c8_data_clk>;
                                pinctrl-names = "default";
  
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
                                status = "disabled";
                        };
 -              };
  
 -              config_noc: interconnect@1600000 {
 -                      compatible = "qcom,eliza-cnoc-cfg";
 -                      reg = <0x0 0x01600000 0x0 0x5200>;
 -                      qcom,bcm-voters = <&apps_bcm_voter>;
 -                      #interconnect-cells = <2>;
 -              };
 +                      spi8: spi@880000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0x0 0x00880000 0x0 0x4000>;
  
 -              cnoc_main: interconnect@1500000 {
 -                      compatible = "qcom,eliza-cnoc-main";
 -                      reg = <0x0 0x01500000 0x0 0x16080>;
 -                      qcom,bcm-voters = <&apps_bcm_voter>;
 -                      #interconnect-cells = <2>;
 -              };
 +                              interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
  
 -              system_noc: interconnect@1680000 {
 -                      compatible = "qcom,eliza-system-noc";
 -                      reg = <0x0 0x01680000 0x0 0x40000>;
 -                      qcom,bcm-voters = <&apps_bcm_voter>;
 -                      #interconnect-cells = <2>;
 -              };
 +                              clocks = <&gcc GCC_QUPV3_WRAP2_S0_CLK>;
 +                              clock-names = "se";
  
 -              pcie_noc: interconnect@16c0000 {
 -                      compatible = "qcom,eliza-pcie-anoc";
 -                      reg = <0x0 0x016c0000 0x0 0x11400>;
 -                      qcom,bcm-voters = <&apps_bcm_voter>;
 -                      clocks = <&gcc GCC_AGGRE_NOC_PCIE_AXI_CLK>,
 -                               <&gcc GCC_CFG_NOC_PCIE_ANOC_AHB_CLK>;
 -                      #interconnect-cells = <2>;
 -              };
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt  SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config",
 +                                                   "qup-memory";
  
 -              aggre1_noc: interconnect@16e0000 {
 -                      compatible = "qcom,eliza-aggre1-noc";
 -                      reg = <0x0 0x016e0000 0x0 0x16400>;
 -                      qcom,bcm-voters = <&apps_bcm_voter>;
 -                      clocks = <&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>,
 -                               <&gcc GCC_AGGRE_USB3_PRIM_AXI_CLK>;
 -                      #interconnect-cells = <2>;
 -              };
 +                              dmas = <&gpi_dma2 0 0 QCOM_GPI_SPI>,
 +                                     <&gpi_dma2 1 0 QCOM_GPI_SPI>;
 +                              dma-names = "tx",
 +                                          "rx";
  
 -              aggre2_noc: interconnect@1700000 {
 -                      compatible = "qcom,eliza-aggre2-noc";
 -                      reg = <0x0 0x01700000 0x0 0x1f400>;
 -                      qcom,bcm-voters = <&apps_bcm_voter>;
 -                      clocks = <&rpmhcc RPMH_IPA_CLK>;
 -                      #interconnect-cells = <2>;
 -              };
 +                              pinctrl-0 = <&qup_spi8_data_clk>, <&qup_spi8_cs>;
 +                              pinctrl-names = "default";
  
 -              mmss_noc: interconnect@1780000 {
 -                      compatible = "qcom,eliza-mmss-noc";
 -                      reg = <0x0 0x01780000 0x0 0x7d800>;
 -                      qcom,bcm-voters = <&apps_bcm_voter>;
 -                      #interconnect-cells = <2>;
 -              };
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
  
 -              ufs_mem_phy: phy@1d80000 {
 -                      compatible = "qcom,eliza-qmp-ufs-phy",
 -                                   "qcom,sm8650-qmp-ufs-phy";
 -                      reg = <0x0 0x01d80000 0x0 0x2000>;
 +                              status = "disabled";
 +                      };
  
 -                      clocks = <&rpmhcc RPMH_CXO_CLK>,
 -                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>,
 -                               <&tcsr TCSR_UFS_CLKREF_EN>;
 -                      clock-names = "ref",
 -                                    "ref_aux",
 -                                    "qref";
 +                      i2c9: i2c@884000 {
 +                              compatible = "qcom,geni-i2c";
 +                              reg = <0x0 0x00884000 0x0 0x4000>;
  
 -                      resets = <&ufs_mem_hc 0>;
 -                      reset-names = "ufsphy";
 +                              interrupts = <GIC_SPI 583 IRQ_TYPE_LEVEL_HIGH>;
  
 -                      power-domains = <&gcc GCC_UFS_MEM_PHY_GDSC>;
 +                              clocks = <&gcc GCC_QUPV3_WRAP2_S1_CLK>;
 +                              clock-names = "se";
  
 -                      #clock-cells = <1>;
 -                      #phy-cells = <0>;
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt  SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config",
 +                                                   "qup-memory";
  
 -                      status = "disabled";
 -              };
 +                              dmas = <&gpi_dma2 0 1 QCOM_GPI_I2C>,
 +                                     <&gpi_dma2 1 1 QCOM_GPI_I2C>;
 +                              dma-names = "tx",
 +                                          "rx";
  
 -              ufs_mem_hc: ufshc@1d84000 {
 -                      compatible = "qcom,eliza-ufshc",
 -                                   "qcom,ufshc",
 -                                   "jedec,ufs-2.0";
 -                      reg = <0x0 0x01d84000 0x0 0x3000>,
 -                            <0x0 0x01da0000 0x0 0x15000>;
 -                      reg-names = "std",
 -                                  "mcq";
 +                              pinctrl-0 = <&qup_i2c9_data_clk>;
 +                              pinctrl-names = "default";
  
 -                      interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
  
 -                      clocks = <&gcc GCC_UFS_PHY_AXI_CLK>,
 -                               <&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>,
 -                               <&gcc GCC_UFS_PHY_AHB_CLK>,
 -                               <&gcc GCC_UFS_PHY_UNIPRO_CORE_CLK>,
 -                               <&rpmhcc RPMH_LN_BB_CLK3>,
 -                               <&gcc GCC_UFS_PHY_TX_SYMBOL_0_CLK>,
 -                               <&gcc GCC_UFS_PHY_RX_SYMBOL_0_CLK>,
 -                               <&gcc GCC_UFS_PHY_RX_SYMBOL_1_CLK>;
 -                      clock-names = "core_clk",
 -                                    "bus_aggr_clk",
 -                                    "iface_clk",
 -                                    "core_clk_unipro",
 -                                    "ref_clk",
 -                                    "tx_lane0_sync_clk",
 -                                    "rx_lane0_sync_clk",
 -                                    "rx_lane1_sync_clk";
 +                              status = "disabled";
 +                      };
  
 -                      operating-points-v2 = <&ufs_opp_table>;
 +                      spi9: spi@884000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0x0 0x00884000 0x0 0x4000>;
  
 -                      resets = <&gcc GCC_UFS_PHY_BCR>;
 -                      reset-names = "rst";
 +                              interrupts = <GIC_SPI 583 IRQ_TYPE_LEVEL_HIGH>;
  
 -                      interconnects = <&aggre1_noc MASTER_UFS_MEM QCOM_ICC_TAG_ALWAYS
 -                                       &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>,
 -                                      <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 -                                       &config_noc SLAVE_UFS_MEM_CFG QCOM_ICC_TAG_ACTIVE_ONLY>;
 -                      interconnect-names = "ufs-ddr",
 -                                           "cpu-ufs";
 +                              clocks = <&gcc GCC_QUPV3_WRAP2_S1_CLK>;
 +                              clock-names = "se";
  
 -                      power-domains = <&gcc GCC_UFS_PHY_GDSC>;
 -                      required-opps = <&rpmhpd_opp_nom>;
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt  SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config",
 +                                                   "qup-memory";
  
 -                      iommus = <&apps_smmu 0x60 0x0>;
 -                      dma-coherent;
 +                              dmas = <&gpi_dma2 0 1 QCOM_GPI_SPI>,
 +                                     <&gpi_dma2 1 1 QCOM_GPI_SPI>;
 +                              dma-names = "tx",
 +                                          "rx";
  
 -                      msi-parent = <&gic_its 0x60>;
 +                              pinctrl-0 = <&qup_spi9_data_clk>, <&qup_spi9_cs>;
 +                              pinctrl-names = "default";
  
 -                      lanes-per-direction = <2>;
 -                      qcom,ice = <&ice>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
  
 -                      phys = <&ufs_mem_phy>;
 -                      phy-names = "ufsphy";
 +                              status = "disabled";
 +                      };
  
 -                      #reset-cells = <1>;
 +                      i2c10: i2c@888000 {
 +                              compatible = "qcom,geni-i2c";
 +                              reg = <0x0 0x00888000 0x0 0x4000>;
  
 -                      status = "disabled";
 +                              interrupts = <GIC_SPI 584 IRQ_TYPE_LEVEL_HIGH>;
  
 -                      ufs_opp_table: opp-table {
 -                              compatible = "operating-points-v2";
 +                              clocks = <&gcc GCC_QUPV3_WRAP2_S2_CLK>;
 +                              clock-names = "se";
  
 -                              opp-100000000 {
 -                                      opp-hz = /bits/ 64 <100000000>,
 -                                               /bits/ 64 <0>,
 -                                               /bits/ 64 <0>,
 -                                               /bits/ 64 <100000000>,
 -                                               /bits/ 64 <0>,
 -                                               /bits/ 64 <0>,
 -                                               /bits/ 64 <0>,
 -                                               /bits/ 64 <0>;
 -                                      required-opps = <&rpmhpd_opp_low_svs>;
 -                              };
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt  SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config",
 +                                                   "qup-memory";
  
 -                              opp-201500000 {
 -                                      opp-hz = /bits/ 64 <201500000>,
 -                                               /bits/ 64 <0>,
 -                                               /bits/ 64 <0>,
 -                                               /bits/ 64 <201500000>,
 -                                               /bits/ 64 <0>,
 -                                               /bits/ 64 <0>,
 -                                               /bits/ 64 <0>,
 -                                               /bits/ 64 <0>;
 -                                      required-opps = <&rpmhpd_opp_svs_l1>;
 -                              };
 +                              dmas = <&gpi_dma2 0 2 QCOM_GPI_I2C>,
 +                                     <&gpi_dma2 1 2 QCOM_GPI_I2C>;
 +                              dma-names = "tx",
 +                                          "rx";
  
 -                              opp-403000000 {
 -                                      opp-hz = /bits/ 64 <403000000>,
 -                                               /bits/ 64 <0>,
 -                                               /bits/ 64 <0>,
 -                                               /bits/ 64 <403000000>,
 -                                               /bits/ 64 <0>,
 -                                               /bits/ 64 <0>,
 -                                               /bits/ 64 <0>,
 -                                               /bits/ 64 <0>;
 -                                      required-opps = <&rpmhpd_opp_nom>;
 -                              };
 +                              pinctrl-0 = <&qup_i2c10_data_clk>;
 +                              pinctrl-names = "default";
 +
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              status = "disabled";
                        };
 -              };
  
 -              ice: crypto@1d88000 {
 -                      compatible = "qcom,eliza-inline-crypto-engine",
 -                                   "qcom,inline-crypto-engine";
 -                      reg = <0x0 0x01d88000 0x0 0x18000>;
 +                      spi10: spi@888000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0x0 0x00888000 0x0 0x4000>;
 +
 +                              interrupts = <GIC_SPI 584 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                              clocks = <&gcc GCC_QUPV3_WRAP2_S2_CLK>;
 +                              clock-names = "se";
 +
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt  SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config",
 +                                                   "qup-memory";
 +
 +                              dmas = <&gpi_dma2 0 2 QCOM_GPI_SPI>,
 +                                     <&gpi_dma2 1 2 QCOM_GPI_SPI>;
 +                              dma-names = "tx",
 +                                          "rx";
 +
 +                              pinctrl-0 = <&qup_spi10_data_clk>, <&qup_spi10_cs>;
 +                              pinctrl-names = "default";
 +
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              status = "disabled";
 +                      };
 +
 +                      i2c11: i2c@88c000 {
 +                              compatible = "qcom,geni-i2c";
 +                              reg = <0x0 0x0088c000 0x0 0x4000>;
 +
 +                              interrupts = <GIC_SPI 585 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                              clocks = <&gcc GCC_QUPV3_WRAP2_S3_CLK>;
 +                              clock-names = "se";
 +
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt  SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config",
 +                                                   "qup-memory";
 +
 +                              dmas = <&gpi_dma2 0 3 QCOM_GPI_I2C>,
 +                                     <&gpi_dma2 1 3 QCOM_GPI_I2C>;
 +                              dma-names = "tx",
 +                                          "rx";
 +
 +                              pinctrl-0 = <&qup_i2c11_data_clk>;
 +                              pinctrl-names = "default";
 +
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              status = "disabled";
 +                      };
 +
 +                      spi11: spi@88c000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0x0 0x0088c000 0x0 0x4000>;
 +
 +                              interrupts = <GIC_SPI 585 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                              clocks = <&gcc GCC_QUPV3_WRAP2_S3_CLK>;
 +                              clock-names = "se";
 +
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt  SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config",
 +                                                   "qup-memory";
 +
 +                              dmas = <&gpi_dma2 0 3 QCOM_GPI_SPI>,
 +                                     <&gpi_dma2 1 3 QCOM_GPI_SPI>;
 +                              dma-names = "tx",
 +                                          "rx";
 +
 +                              pinctrl-0 = <&qup_spi11_data_clk>, <&qup_spi11_cs>;
 +                              pinctrl-names = "default";
 +
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              status = "disabled";
 +                      };
 +
 +                      i2c12: i2c@890000 {
 +                              compatible = "qcom,geni-i2c";
 +                              reg = <0x0 0x00890000 0x0 0x4000>;
 +
 +                              interrupts = <GIC_SPI 586 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                              clocks = <&gcc GCC_QUPV3_WRAP2_S4_CLK>;
 +                              clock-names = "se";
 +
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt  SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config",
 +                                                   "qup-memory";
 +
 +                              dmas = <&gpi_dma2 0 4 QCOM_GPI_I2C>,
 +                                     <&gpi_dma2 1 4 QCOM_GPI_I2C>;
 +                              dma-names = "tx",
 +                                          "rx";
 +
 +                              pinctrl-0 = <&qup_i2c12_data_clk>;
 +                              pinctrl-names = "default";
 +
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              status = "disabled";
 +                      };
 +
 +                      spi12: spi@890000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0x0 0x00890000 0x0 0x4000>;
 +
 +                              interrupts = <GIC_SPI 586 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                              clocks = <&gcc GCC_QUPV3_WRAP2_S4_CLK>;
 +                              clock-names = "se";
 +
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt  SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config",
 +                                                   "qup-memory";
 +
 +                              dmas = <&gpi_dma2 0 4 QCOM_GPI_SPI>,
 +                                     <&gpi_dma2 1 4 QCOM_GPI_SPI>;
 +                              dma-names = "tx",
 +                                          "rx";
 +
 +                              pinctrl-0 = <&qup_spi12_data_clk>, <&qup_spi12_cs>;
 +                              pinctrl-names = "default";
 +
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              status = "disabled";
 +                      };
 +
 +                      uart13: serial@894000 {
 +                              compatible = "qcom,geni-uart";
 +                              reg = <0x0 0x00894000 0x0 0x4000>;
 +
 +                              interrupts = <GIC_SPI 587 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                              clocks = <&gcc GCC_QUPV3_WRAP2_S5_CLK>;
 +                              clock-names = "se";
 +
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
 +                                               &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config";
 +
 +                              pinctrl-0 = <&qup_uart13_default>;
 +                              pinctrl-names = "default";
 +
 +                              status = "disabled";
 +                      };
 +
 +                      i2c14: i2c@898000 {
 +                              compatible = "qcom,geni-i2c";
 +                              reg = <0x0 0x00898000 0x0 0x4000>;
 +
 +                              interrupts = <GIC_SPI 461 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                              clocks = <&gcc GCC_QUPV3_WRAP2_S6_CLK>;
 +                              clock-names = "se";
 +
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt  SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config",
 +                                                   "qup-memory";
 +
 +                              dmas = <&gpi_dma2 0 6 QCOM_GPI_I2C>,
 +                                     <&gpi_dma2 1 6 QCOM_GPI_I2C>;
 +                              dma-names = "tx",
 +                                          "rx";
 +
 +                              pinctrl-0 = <&qup_i2c14_data_clk>;
 +                              pinctrl-names = "default";
 +
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              status = "disabled";
 +                      };
 +
 +                      spi14: spi@898000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0x0 0x00898000 0x0 0x4000>;
 +
 +                              interrupts = <GIC_SPI 461 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                              clocks = <&gcc GCC_QUPV3_WRAP2_S6_CLK>;
 +                              clock-names = "se";
 +
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt  SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config",
 +                                                   "qup-memory";
 +
 +                              dmas = <&gpi_dma2 0 6 QCOM_GPI_SPI>,
 +                                     <&gpi_dma2 1 6 QCOM_GPI_SPI>;
 +                              dma-names = "tx",
 +                                          "rx";
 +
 +                              pinctrl-0 = <&qup_spi14_data_clk>, <&qup_spi14_cs>;
 +                              pinctrl-names = "default";
 +
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              status = "disabled";
 +                      };
 +
 +                      i2c15: i2c@89c000 {
 +                              compatible = "qcom,geni-i2c";
 +                              reg = <0x0 0x0089c000 0x0 0x4000>;
 +
 +                              interrupts = <GIC_SPI 462 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                              clocks = <&gcc GCC_QUPV3_WRAP2_S7_CLK>;
 +                              clock-names = "se";
 +
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt  SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config",
 +                                                   "qup-memory";
 +
 +                              dmas = <&gpi_dma2 0 7 QCOM_GPI_I2C>,
 +                                     <&gpi_dma2 1 7 QCOM_GPI_I2C>;
 +                              dma-names = "tx",
 +                                          "rx";
 +
 +                              pinctrl-0 = <&qup_i2c15_data_clk>;
 +                              pinctrl-names = "default";
 +
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              status = "disabled";
 +                      };
 +
 +                      spi15: spi@89c000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0x0 0x0089c000 0x0 0x4000>;
 +
 +                              interrupts = <GIC_SPI 462 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                              clocks = <&gcc GCC_QUPV3_WRAP2_S7_CLK>;
 +                              clock-names = "se";
 +
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt  SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config",
 +                                                   "qup-memory";
 +
 +                              dmas = <&gpi_dma2 0 7 QCOM_GPI_SPI>,
 +                                     <&gpi_dma2 1 7 QCOM_GPI_SPI>;
 +                              dma-names = "tx",
 +                                          "rx";
 +
 +                              pinctrl-0 = <&qup_spi15_data_clk>, <&qup_spi15_cs>;
 +                              pinctrl-names = "default";
 +
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              status = "disabled";
 +                      };
 +              };
 +
 +              gpi_dma1: dma-controller@a00000 {
 +                      compatible = "qcom,eliza-gpi-dma", "qcom,sm6350-gpi-dma";
 +                      reg = <0x0 0x00a00000 0x0 0x60000>;
 +
 +                      interrupts = <GIC_SPI 279 IRQ_TYPE_LEVEL_HIGH>,
 +                                   <GIC_SPI 280 IRQ_TYPE_LEVEL_HIGH>,
 +                                   <GIC_SPI 281 IRQ_TYPE_LEVEL_HIGH>,
 +                                   <GIC_SPI 282 IRQ_TYPE_LEVEL_HIGH>,
 +                                   <GIC_SPI 283 IRQ_TYPE_LEVEL_HIGH>,
 +                                   <GIC_SPI 284 IRQ_TYPE_LEVEL_HIGH>,
 +                                   <GIC_SPI 293 IRQ_TYPE_LEVEL_HIGH>,
 +                                   <GIC_SPI 294 IRQ_TYPE_LEVEL_HIGH>,
 +                                   <GIC_SPI 295 IRQ_TYPE_LEVEL_HIGH>,
 +                                   <GIC_SPI 296 IRQ_TYPE_LEVEL_HIGH>,
 +                                   <GIC_SPI 297 IRQ_TYPE_LEVEL_HIGH>,
 +                                   <GIC_SPI 298 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                      dma-channels = <12>;
 +                      dma-channel-mask = <0x3f>;
 +                      #dma-cells = <3>;
 +
 +                      iommus = <&apps_smmu 0xb6 0x0>;
 +
 +                      dma-coherent;
 +              };
 +
 +              qupv3_1: geniqup@ac0000 {
 +                      compatible = "qcom,geni-se-qup";
 +                      reg = <0x0 0x00ac0000 0x0 0x2000>;
 +
 +                      clocks = <&gcc GCC_QUPV3_WRAP_1_M_AHB_CLK>,
 +                               <&gcc GCC_QUPV3_WRAP_1_S_AHB_CLK>;
 +                      clock-names = "m-ahb",
 +                                    "s-ahb";
 +
 +                      iommus = <&apps_smmu 0xa3 0x0>;
 +
 +                      #address-cells = <2>;
 +                      #size-cells = <2>;
 +                      ranges;
 +
 +                      status = "disabled";
 +
 +                      i2c0: i2c@a80000 {
 +                              compatible = "qcom,geni-i2c";
 +                              reg = <0x0 0x00a80000 0x0 0x4000>;
 +
 +                              interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                              clocks = <&gcc GCC_QUPV3_WRAP1_S0_CLK>;
 +                              clock-names = "se";
 +
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config",
 +                                                   "qup-memory";
 +
 +                              dmas = <&gpi_dma1 0 0 QCOM_GPI_I2C>,
 +                                     <&gpi_dma1 1 0 QCOM_GPI_I2C>;
 +                              dma-names = "tx",
 +                                          "rx";
 +
 +                              pinctrl-0 = <&qup_i2c0_data_clk>;
 +                              pinctrl-names = "default";
 +
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              status = "disabled";
 +                      };
 +
 +                      spi0: spi@a80000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0x0 0x00a80000 0x0 0x4000>;
 +
 +                              interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                              clocks = <&gcc GCC_QUPV3_WRAP1_S0_CLK>;
 +                              clock-names = "se";
 +
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config",
 +                                                   "qup-memory";
 +
 +                              dmas = <&gpi_dma1 0 0 QCOM_GPI_SPI>,
 +                                     <&gpi_dma1 1 0 QCOM_GPI_SPI>;
 +                              dma-names = "tx",
 +                                          "rx";
 +
 +                              pinctrl-0 = <&qup_spi0_data_clk>, <&qup_spi0_cs>;
 +                              pinctrl-names = "default";
 +
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              status = "disabled";
 +                      };
 +
 +                      i2c1: i2c@a84000 {
 +                              compatible = "qcom,geni-i2c";
 +                              reg = <0x0 0x00a84000 0x0 0x4000>;
 +
 +                              interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                              clocks = <&gcc GCC_QUPV3_WRAP1_S1_CLK>;
 +                              clock-names = "se";
 +
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config",
 +                                                   "qup-memory";
 +
 +                              dmas = <&gpi_dma1 0 1 QCOM_GPI_I2C>,
 +                                     <&gpi_dma1 1 1 QCOM_GPI_I2C>;
 +                              dma-names = "tx",
 +                                          "rx";
 +
 +                              pinctrl-0 = <&qup_i2c1_data_clk>;
 +                              pinctrl-names = "default";
 +
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              status = "disabled";
 +                      };
 +
 +                      spi1: spi@a84000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0x0 0x00a84000 0x0 0x4000>;
 +
 +                              interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                              clocks = <&gcc GCC_QUPV3_WRAP1_S1_CLK>;
 +                              clock-names = "se";
 +
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config",
 +                                                   "qup-memory";
 +
 +                              dmas = <&gpi_dma1 0 1 QCOM_GPI_SPI>,
 +                                     <&gpi_dma1 1 1 QCOM_GPI_SPI>;
 +                              dma-names = "tx",
 +                                          "rx";
 +
 +                              pinctrl-0 = <&qup_spi1_data_clk>, <&qup_spi1_cs>;
 +                              pinctrl-names = "default";
 +
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              status = "disabled";
 +                      };
 +
 +                      i2c2: i2c@a88000 {
 +                              compatible = "qcom,geni-i2c";
 +                              reg = <0x0 0x00a88000 0x0 0x4000>;
 +
 +                              interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                              clocks = <&gcc GCC_QUPV3_WRAP1_S2_CLK>;
 +                              clock-names = "se";
 +
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config",
 +                                                   "qup-memory";
 +
 +                              dmas = <&gpi_dma1 0 2 QCOM_GPI_I2C>,
 +                                     <&gpi_dma1 1 2 QCOM_GPI_I2C>;
 +                              dma-names = "tx",
 +                                          "rx";
 +
 +                              pinctrl-0 = <&qup_i2c2_data_clk>;
 +                              pinctrl-names = "default";
 +
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              status = "disabled";
 +                      };
 +
 +                      spi2: spi@a88000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0x0 0x00a88000 0x0 0x4000>;
 +
 +                              interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                              clocks = <&gcc GCC_QUPV3_WRAP1_S2_CLK>;
 +                              clock-names = "se";
 +
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config",
 +                                                   "qup-memory";
 +
 +                              dmas = <&gpi_dma1 0 2 QCOM_GPI_SPI>,
 +                                     <&gpi_dma1 1 2 QCOM_GPI_SPI>;
 +                              dma-names = "tx",
 +                                          "rx";
 +
 +                              pinctrl-0 = <&qup_spi2_data_clk>, <&qup_spi2_cs>;
 +                              pinctrl-names = "default";
 +
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              status = "disabled";
 +                      };
 +
 +                      i2c3: i2c@a8c000 {
 +                              compatible = "qcom,geni-i2c";
 +                              reg = <0x0 0x00a8c000 0x0 0x4000>;
 +
 +                              interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                              clocks = <&gcc GCC_QUPV3_WRAP1_S3_CLK>;
 +                              clock-names = "se";
 +
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config",
 +                                                   "qup-memory";
 +
 +                              dmas = <&gpi_dma1 0 3 QCOM_GPI_I2C>,
 +                                     <&gpi_dma1 1 3 QCOM_GPI_I2C>;
 +                              dma-names = "tx",
 +                                          "rx";
 +
 +                              pinctrl-0 = <&qup_i2c3_data_clk>;
 +                              pinctrl-names = "default";
 +
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              status = "disabled";
 +                      };
 +
 +                      spi3: spi@a8c000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0x0 0x00a8c000 0x0 0x4000>;
 +
 +                              interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                              clocks = <&gcc GCC_QUPV3_WRAP1_S3_CLK>;
 +                              clock-names = "se";
 +
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config",
 +                                                   "qup-memory";
 +
 +                              dmas = <&gpi_dma1 0 3 QCOM_GPI_SPI>,
 +                                     <&gpi_dma1 1 3 QCOM_GPI_SPI>;
 +                              dma-names = "tx",
 +                                          "rx";
 +
 +                              pinctrl-0 = <&qup_spi3_data_clk>, <&qup_spi3_cs>;
 +                              pinctrl-names = "default";
 +
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              status = "disabled";
 +                      };
 +
 +                      i2c4: i2c@a90000 {
 +                              compatible = "qcom,geni-i2c";
 +                              reg = <0x0 0x00a90000 0x0 0x4000>;
 +
 +                              interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                              clocks = <&gcc GCC_QUPV3_WRAP1_S4_CLK>;
 +                              clock-names = "se";
 +
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config",
 +                                                   "qup-memory";
 +
 +                              dmas = <&gpi_dma1 0 4 QCOM_GPI_I2C>,
 +                                     <&gpi_dma1 1 4 QCOM_GPI_I2C>;
 +                              dma-names = "tx",
 +                                          "rx";
 +
 +                              pinctrl-0 = <&qup_i2c4_data_clk>;
 +                              pinctrl-names = "default";
 +
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              status = "disabled";
 +                      };
 +
 +                      spi4: spi@a90000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0x0 0x00a90000 0x0 0x4000>;
 +
 +                              interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                              clocks = <&gcc GCC_QUPV3_WRAP1_S4_CLK>;
 +                              clock-names = "se";
 +
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config",
 +                                                   "qup-memory";
 +
 +                              dmas = <&gpi_dma1 0 4 QCOM_GPI_SPI>,
 +                                     <&gpi_dma1 1 4 QCOM_GPI_SPI>;
 +                              dma-names = "tx",
 +                                          "rx";
 +
 +                              pinctrl-0 = <&qup_spi4_clk>, <&qup_spi4_cs>,
 +                                          <&qup_spi4_data>;
 +                              pinctrl-names = "default";
 +
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              status = "disabled";
 +                      };
 +
 +                      uart5: serial@a94000 {
 +                              compatible = "qcom,geni-uart";
 +                              reg = <0x0 0x00a94000 0x0 0x4000>;
 +
 +                              interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                              clocks = <&gcc GCC_QUPV3_WRAP1_S5_CLK>;
 +                              clock-names = "se";
 +
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
 +                                               &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config";
 +
 +                              pinctrl-0 = <&qup_uart5_default>, <&qup_uart5_cts_rts>;
 +                              pinctrl-names = "default";
 +
 +                              status = "disabled";
 +                      };
 +
 +                      uart6: serial@a98000 {
 +                              compatible = "qcom,geni-uart";
 +                              reg = <0x0 0x00a98000 0x0 0x4000>;
 +
 +                              interrupts = <GIC_SPI 363 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                              clocks = <&gcc GCC_QUPV3_WRAP1_S6_CLK>;
 +                              clock-names = "se";
 +
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
 +                                               &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config";
 +
 +                              pinctrl-0 = <&qup_uart6_default>, <&qup_uart6_cts_rts>;
 +                              pinctrl-names = "default";
 +
 +                              status = "disabled";
 +                      };
 +
 +                      i2c7: i2c@a9c000 {
 +                              compatible = "qcom,geni-i2c";
 +                              reg = <0x0 0x00a9c000 0x0 0x4000>;
 +
 +                              interrupts = <GIC_SPI 579 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                              clocks = <&gcc GCC_QUPV3_WRAP1_S7_CLK>;
 +                              clock-names = "se";
 +
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config",
 +                                                   "qup-memory";
 +
 +                              dmas = <&gpi_dma1 0 7 QCOM_GPI_I2C>,
 +                                     <&gpi_dma1 1 7 QCOM_GPI_I2C>;
 +                              dma-names = "tx",
 +                                          "rx";
 +
 +                              pinctrl-0 = <&qup_i2c7_data_clk>;
 +                              pinctrl-names = "default";
 +
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              status = "disabled";
 +                      };
 +
 +                      spi7: spi@a9c000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0x0 0x00a9c000 0x0 0x4000>;
 +
 +                              interrupts = <GIC_SPI 579 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                              clocks = <&gcc GCC_QUPV3_WRAP1_S7_CLK>;
 +                              clock-names = "se";
 +
 +                              interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
 +                                               &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
 +                                              <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                               &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
 +                                              <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
 +                                               &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                              interconnect-names = "qup-core",
 +                                                   "qup-config",
 +                                                   "qup-memory";
 +
 +                              dmas = <&gpi_dma1 0 7 QCOM_GPI_SPI>,
 +                                     <&gpi_dma1 1 7 QCOM_GPI_SPI>;
 +                              dma-names = "tx",
 +                                          "rx";
 +
 +                              pinctrl-0 = <&qup_spi7_data_clk>, <&qup_spi7_cs>;
 +                              pinctrl-names = "default";
 +
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              status = "disabled";
 +                      };
 +              };
 +
 +              sdhc_1: mmc@f44000 {
 +                      compatible = "qcom,eliza-sdhci", "qcom,sdhci-msm-v5";
 +                      reg = <0x0 0x00f44000 0x0 0x1000>,
 +                            <0x0 0x00f45000 0x0 0x1000>;
 +                      reg-names = "hc",
 +                                  "cqhci";
 +
 +                      interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>,
 +                                   <GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH>;
 +                      interrupt-names = "hc_irq",
 +                                        "pwr_irq";
 +
 +                      clocks = <&gcc GCC_SDCC1_AHB_CLK>,
 +                               <&gcc GCC_SDCC1_APPS_CLK>,
 +                               <&rpmhcc RPMH_CXO_CLK>;
 +                      clock-names = "iface",
 +                                    "core",
 +                                    "xo";
 +
 +                      interconnects = <&aggre2_noc MASTER_SDCC_1 QCOM_ICC_TAG_ALWAYS
 +                                       &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>,
 +                                      <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                       &config_noc 30 /*TODO: SLAVE_SDCC_1*/ QCOM_ICC_TAG_ACTIVE_ONLY>;
 +                      interconnect-names = "sdhc-ddr",
 +                                           "cpu-sdhc";
 +
 +                      power-domains = <&rpmhpd RPMHPD_CX>;
 +                      operating-points-v2 = <&sdhc1_opp_table>;
 +
 +                      qcom,dll-config = <0x000f44ec>;
 +                      qcom,ddr-config = <0x80040868>;
 +
 +                      iommus = <&apps_smmu 0x520 0x0>;
 +                      dma-coherent;
 +
 +                      bus-width = <8>;
 +
 +                      resets = <&gcc GCC_SDCC1_BCR>;
 +
 +                      status = "disabled";
 +
 +                      sdhc1_opp_table: opp-table {
 +                              compatible = "operating-points-v2";
 +
 +                              opp-100000000 {
 +                                      opp-hz = /bits/ 64 <100000000>;
 +                                      required-opps = <&rpmhpd_opp_low_svs>;
 +                              };
 +
 +                              opp-384000000 {
 +                                      opp-hz = /bits/ 64 <384000000>;
 +                                      required-opps = <&rpmhpd_opp_svs_l1>;
 +                              };
 +                      };
 +              };
 +
 +              cnoc_main: interconnect@1500000 {
 +                      compatible = "qcom,eliza-cnoc-main";
 +                      reg = <0x0 0x01500000 0x0 0x16080>;
 +                      qcom,bcm-voters = <&apps_bcm_voter>;
 +                      #interconnect-cells = <2>;
 +              };
 +
 +              config_noc: interconnect@1600000 {
 +                      compatible = "qcom,eliza-cnoc-cfg";
 +                      reg = <0x0 0x01600000 0x0 0x5200>;
 +                      qcom,bcm-voters = <&apps_bcm_voter>;
 +                      #interconnect-cells = <2>;
 +              };
 +
 +              system_noc: interconnect@1680000 {
 +                      compatible = "qcom,eliza-system-noc";
 +                      reg = <0x0 0x01680000 0x0 0x40000>;
 +                      qcom,bcm-voters = <&apps_bcm_voter>;
 +                      #interconnect-cells = <2>;
 +              };
 +
 +              pcie_noc: interconnect@16c0000 {
 +                      compatible = "qcom,eliza-pcie-anoc";
 +                      reg = <0x0 0x016c0000 0x0 0x11400>;
 +                      qcom,bcm-voters = <&apps_bcm_voter>;
 +                      clocks = <&gcc GCC_AGGRE_NOC_PCIE_AXI_CLK>,
 +                               <&gcc GCC_CFG_NOC_PCIE_ANOC_AHB_CLK>;
 +                      #interconnect-cells = <2>;
 +              };
 +
 +              aggre1_noc: interconnect@16e0000 {
 +                      compatible = "qcom,eliza-aggre1-noc";
 +                      reg = <0x0 0x016e0000 0x0 0x16400>;
 +                      qcom,bcm-voters = <&apps_bcm_voter>;
 +                      clocks = <&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>,
 +                               <&gcc GCC_AGGRE_USB3_PRIM_AXI_CLK>;
 +                      #interconnect-cells = <2>;
 +              };
 +
 +              aggre2_noc: interconnect@1700000 {
 +                      compatible = "qcom,eliza-aggre2-noc";
 +                      reg = <0x0 0x01700000 0x0 0x1f400>;
 +                      qcom,bcm-voters = <&apps_bcm_voter>;
 +                      clocks = <&rpmhcc RPMH_IPA_CLK>;
 +                      #interconnect-cells = <2>;
 +              };
 +
 +              mmss_noc: interconnect@1780000 {
 +                      compatible = "qcom,eliza-mmss-noc";
 +                      reg = <0x0 0x01780000 0x0 0x7d800>;
 +                      qcom,bcm-voters = <&apps_bcm_voter>;
 +                      #interconnect-cells = <2>;
 +              };
 +
 +              ufs_mem_phy: phy@1d80000 {
 +                      compatible = "qcom,eliza-qmp-ufs-phy",
 +                                   "qcom,sm8650-qmp-ufs-phy";
 +                      reg = <0x0 0x01d80000 0x0 0x2000>;
 +
 +                      clocks = <&rpmhcc RPMH_CXO_CLK>,
 +                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>,
 +                               <&tcsr TCSR_UFS_CLKREF_EN>;
 +                      clock-names = "ref",
 +                                    "ref_aux",
 +                                    "qref";
 +
 +                      resets = <&ufs_mem_hc 0>;
 +                      reset-names = "ufsphy";
 +
 +                      power-domains = <&gcc GCC_UFS_MEM_PHY_GDSC>;
 +
 +                      #clock-cells = <1>;
 +                      #phy-cells = <0>;
 +
 +                      status = "disabled";
 +              };
 +
 +              ufs_mem_hc: ufshc@1d84000 {
 +                      compatible = "qcom,eliza-ufshc",
 +                                   "qcom,ufshc",
 +                                   "jedec,ufs-2.0";
 +                      reg = <0x0 0x01d84000 0x0 0x3000>,
 +                            <0x0 0x01da0000 0x0 0x15000>;
 +                      reg-names = "std",
 +                                  "mcq";
 +
 +                      interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                      clocks = <&gcc GCC_UFS_PHY_AXI_CLK>,
 +                               <&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>,
 +                               <&gcc GCC_UFS_PHY_AHB_CLK>,
 +                               <&gcc GCC_UFS_PHY_UNIPRO_CORE_CLK>,
 +                               <&rpmhcc RPMH_LN_BB_CLK3>,
 +                               <&gcc GCC_UFS_PHY_TX_SYMBOL_0_CLK>,
 +                               <&gcc GCC_UFS_PHY_RX_SYMBOL_0_CLK>,
 +                               <&gcc GCC_UFS_PHY_RX_SYMBOL_1_CLK>;
 +                      clock-names = "core_clk",
 +                                    "bus_aggr_clk",
 +                                    "iface_clk",
 +                                    "core_clk_unipro",
 +                                    "ref_clk",
 +                                    "tx_lane0_sync_clk",
 +                                    "rx_lane0_sync_clk",
 +                                    "rx_lane1_sync_clk";
 +
 +                      operating-points-v2 = <&ufs_opp_table>;
 +
 +                      resets = <&gcc GCC_UFS_PHY_BCR>;
 +                      reset-names = "rst";
 +
 +                      interconnects = <&aggre1_noc MASTER_UFS_MEM QCOM_ICC_TAG_ALWAYS
 +                                       &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>,
 +                                      <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                       &config_noc SLAVE_UFS_MEM_CFG QCOM_ICC_TAG_ACTIVE_ONLY>;
 +                      interconnect-names = "ufs-ddr",
 +                                           "cpu-ufs";
 +
 +                      power-domains = <&gcc GCC_UFS_PHY_GDSC>;
 +                      required-opps = <&rpmhpd_opp_nom>;
 +
 +                      iommus = <&apps_smmu 0x60 0x0>;
 +                      dma-coherent;
 +
 +                      msi-parent = <&gic_its 0x60>;
 +
 +                      lanes-per-direction = <2>;
 +                      qcom,ice = <&ice>;
 +
 +                      phys = <&ufs_mem_phy>;
 +                      phy-names = "ufsphy";
 +
 +                      #reset-cells = <1>;
 +
 +                      status = "disabled";
 +
 +                      ufs_opp_table: opp-table {
 +                              compatible = "operating-points-v2";
 +
 +                              opp-100000000 {
 +                                      opp-hz = /bits/ 64 <100000000>,
 +                                               /bits/ 64 <0>,
 +                                               /bits/ 64 <0>,
 +                                               /bits/ 64 <100000000>,
 +                                               /bits/ 64 <0>,
 +                                               /bits/ 64 <0>,
 +                                               /bits/ 64 <0>,
 +                                               /bits/ 64 <0>;
 +                                      required-opps = <&rpmhpd_opp_low_svs>;
 +                              };
 +
 +                              opp-201500000 {
 +                                      opp-hz = /bits/ 64 <201500000>,
 +                                               /bits/ 64 <0>,
 +                                               /bits/ 64 <0>,
 +                                               /bits/ 64 <201500000>,
 +                                               /bits/ 64 <0>,
 +                                               /bits/ 64 <0>,
 +                                               /bits/ 64 <0>,
 +                                               /bits/ 64 <0>;
 +                                      required-opps = <&rpmhpd_opp_svs_l1>;
 +                              };
 +
 +                              opp-403000000 {
 +                                      opp-hz = /bits/ 64 <403000000>,
 +                                               /bits/ 64 <0>,
 +                                               /bits/ 64 <0>,
 +                                               /bits/ 64 <403000000>,
 +                                               /bits/ 64 <0>,
 +                                               /bits/ 64 <0>,
 +                                               /bits/ 64 <0>,
 +                                               /bits/ 64 <0>;
 +                                      required-opps = <&rpmhpd_opp_nom>;
 +                              };
 +                      };
 +              };
 +
 +              ice: crypto@1d88000 {
 +                      compatible = "qcom,eliza-inline-crypto-engine",
 +                                   "qcom,inline-crypto-engine";
 +                      reg = <0x0 0x01d88000 0x0 0x18000>;
 +
-                       clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>;
++                      clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>,
++                               <&gcc GCC_UFS_PHY_AHB_CLK>;
++                      clock-names = "core",
++                                    "iface";
++                      power-domains = <&gcc GCC_UFS_PHY_GDSC>;
 +              };
 +
 +              cryptobam: dma-controller@1dc4000 {
 +                      compatible = "qcom,bam-v1.7.4", "qcom,bam-v1.7.0";
 +                      reg = <0x0 0x01dc4000 0x0 0x28000>;
 +
 +                      interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                      #dma-cells = <1>;
 +
 +                      iommus = <&apps_smmu 0x480 0>,
 +                               <&apps_smmu 0x481 0>;
 +
 +                      qcom,ee = <0>;
 +                      qcom,num-ees = <4>;
 +                      num-channels = <20>;
 +                      qcom,controlled-remotely;
 +              };
 +
 +              crypto: crypto@1dfa000 {
 +                      compatible = "qcom,eliza-qce", "qcom,sm8150-qce", "qcom,qce";
 +                      reg = <0x0 0x01dfa000 0x0 0x6000>;
 +
 +                      interconnects = <&aggre2_noc MASTER_CRYPTO QCOM_ICC_TAG_ALWAYS
 +                                       &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                      interconnect-names = "memory";
 +
 +                      dmas = <&cryptobam 4>, <&cryptobam 5>;
 +                      dma-names = "rx", "tx";
 +
 +                      iommus = <&apps_smmu 0x480 0>,
 +                               <&apps_smmu 0x481 0>;
 +              };
 +
 +              tcsr_mutex: hwlock@1f40000 {
 +                      compatible = "qcom,tcsr-mutex";
 +                      reg = <0x0 0x01f40000 0x0 0x20000>;
 +                      #hwlock-cells = <1>;
 +              };
 +
 +              tcsr: clock-controller@1fbf000 {
 +                      compatible = "qcom,eliza-tcsr", "syscon";
 +                      reg = <0x0 0x01fbf000 0x0 0x21000>;
 +
 +                      clocks = <&rpmhcc RPMH_CXO_CLK>;
 +
 +                      #clock-cells = <1>;
 +                      #reset-cells = <1>;
 +              };
 +
 +              remoteproc_adsp: remoteproc@3000000 {
 +                      compatible = "qcom,eliza-adsp-pas";
 +                      reg = <0x0 0x03000000 0x0 0x10000>;
 +
 +                      interrupts-extended = <&pdc 6 IRQ_TYPE_EDGE_RISING>,
 +                                            <&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>,
 +                                            <&smp2p_adsp_in 1 IRQ_TYPE_EDGE_RISING>,
 +                                            <&smp2p_adsp_in 2 IRQ_TYPE_EDGE_RISING>,
 +                                            <&smp2p_adsp_in 3 IRQ_TYPE_EDGE_RISING>,
 +                                            <&smp2p_adsp_in 7 IRQ_TYPE_EDGE_RISING>;
 +                      interrupt-names = "wdog",
 +                                        "fatal",
 +                                        "ready",
 +                                        "handover",
 +                                        "stop-ack",
 +                                        "shutdown-ack";
 +
 +                      clocks = <&rpmhcc RPMH_CXO_CLK>;
 +                      clock-names = "xo";
 +
 +                      power-domains = <&rpmhpd RPMHPD_LCX>,
 +                                      <&rpmhpd RPMHPD_LMX>;
 +                      power-domain-names = "lcx",
 +                                           "lmx";
 +
 +                      interconnects = <&lpass_lpicx_noc MASTER_LPASS_PROC QCOM_ICC_TAG_ALWAYS
 +                                       &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +
 +                      memory-region = <&adspslpi_mem>, <&q6_adsp_dtb_mem>;
 +
 +                      qcom,qmp = <&aoss_qmp>;
 +
 +                      qcom,smem-states = <&smp2p_adsp_out 0>;
 +                      qcom,smem-state-names = "stop";
 +
 +                      status = "disabled";
 +
 +                      glink-edge {
 +                              interrupts-extended = <&ipcc IPCC_CLIENT_LPASS
 +                                                           IPCC_MPROC_SIGNAL_GLINK_QMP
 +                                                           IRQ_TYPE_EDGE_RISING>;
 +                              mboxes = <&ipcc IPCC_CLIENT_LPASS
 +                                              IPCC_MPROC_SIGNAL_GLINK_QMP>;
 +
 +                              label = "lpass";
 +                              qcom,remote-pid = <2>;
 +                      };
 +              };
 +
 +              lpass_lpiaon_noc: interconnect@7400000 {
 +                      compatible = "qcom,eliza-lpass-lpiaon-noc";
 +                      reg = <0x0 0x07400000 0x0 0x19080>;
 +                      qcom,bcm-voters = <&apps_bcm_voter>;
 +                      #interconnect-cells = <2>;
 +              };
 +
 +              lpass_lpicx_noc: interconnect@7420000 {
 +                      compatible = "qcom,eliza-lpass-lpicx-noc";
 +                      reg = <0x0 0x07420000 0x0 0x44080>;
 +                      qcom,bcm-voters = <&apps_bcm_voter>;
 +                      #interconnect-cells = <2>;
 +              };
 +
 +              sdhc_2: mmc@8804000 {
 +                      compatible = "qcom,eliza-sdhci", "qcom,sdhci-msm-v5";
 +                      reg = <0x0 0x08804000 0x0 0x1000>;
 +
 +                      interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>,
 +                                   <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
 +                      interrupt-names = "hc_irq",
 +                                        "pwr_irq";
 +
 +                      clocks = <&gcc GCC_SDCC2_AHB_CLK>,
 +                               <&gcc GCC_SDCC2_APPS_CLK>,
 +                               <&rpmhcc RPMH_CXO_CLK>;
 +                      clock-names = "iface",
 +                                    "core",
 +                                    "xo";
 +
 +                      interconnects = <&aggre2_noc MASTER_SDCC_2 QCOM_ICC_TAG_ALWAYS
 +                                       &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>,
 +                                      <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                       &config_noc SLAVE_SDCC_2 QCOM_ICC_TAG_ACTIVE_ONLY>;
 +                      interconnect-names = "sdhc-ddr",
 +                                           "cpu-sdhc";
 +
 +                      power-domains = <&rpmhpd RPMHPD_CX>;
 +                      operating-points-v2 = <&sdhc2_opp_table>;
 +
 +                      qcom,dll-config = <0x0007442c>;
 +                      qcom,ddr-config = <0x80040868>;
 +
 +                      iommus = <&apps_smmu 0x540 0x0>;
 +                      dma-coherent;
 +
 +                      bus-width = <4>;
 +
 +                      resets = <&gcc GCC_SDCC2_BCR>;
 +
 +                      status = "disabled";
 +
 +                      sdhc2_opp_table: opp-table {
 +                              compatible = "operating-points-v2";
 +
 +                              opp-100000000 {
 +                                      opp-hz = /bits/ 64 <100000000>;
 +                                      required-opps = <&rpmhpd_opp_low_svs>;
 +                              };
 +
 +                              opp-202000000 {
 +                                      opp-hz = /bits/ 64 <202000000>;
 +                                      required-opps = <&rpmhpd_opp_svs_l1>;
 +                              };
 +                      };
 +              };
 +
 +              usb_hsphy: phy@88e3000 {
 +                      compatible = "qcom,eliza-snps-eusb2-phy",
 +                                   "qcom,sm8550-snps-eusb2-phy";
 +                      reg = <0x0 0x088e3000 0x0 0x154>;
 +                      #phy-cells = <0>;
 +
 +                      clocks = <&tcsr TCSR_USB2_CLKREF_EN>;
 +                      clock-names = "ref";
 +
 +                      resets = <&gcc GCC_QUSB2PHY_PRIM_BCR>;
 +
 +                      status = "disabled";
 +              };
 +
 +              usb_dp_qmpphy: phy@88e8000 {
 +                      compatible = "qcom,eliza-qmp-usb3-dp-phy",
 +                                   "qcom,sm8650-qmp-usb3-dp-phy";
 +                      reg = <0x0 0x088e8000 0x0 0x4000>;
 +
 +                      clocks = <&gcc GCC_USB3_PRIM_PHY_AUX_CLK>,
 +                               <&tcsr TCSR_USB3_CLKREF_EN>,
 +                               <&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>,
 +                               <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>;
 +                      clock-names = "aux",
 +                                    "ref",
 +                                    "com_aux",
 +                                    "usb3_pipe";
 +
 +                      resets = <&gcc GCC_USB3_PHY_PRIM_BCR>,
 +                               <&gcc GCC_USB3_DP_PHY_PRIM_BCR>;
 +                      reset-names = "phy",
 +                                    "common";
 +
 +                      power-domains = <&gcc GCC_USB3_PHY_GDSC>;
 +
 +                      #clock-cells = <1>;
 +                      #phy-cells = <1>;
 +
 +                      mode-switch;
 +                      orientation-switch;
 +
 +                      status = "disabled";
 +
 +                      ports {
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              port@0 {
 +                                      reg = <0>;
 +
 +                                      usb_dp_qmpphy_out: endpoint {
 +                                      };
 +                              };
 +
 +                              port@1 {
 +                                      reg = <1>;
 +
 +                                      usb_dp_qmpphy_usb_ss_in: endpoint {
 +                                              remote-endpoint = <&usb_dwc3_ss>;
 +                                      };
 +                              };
 +
 +                              port@2 {
 +                                      reg = <2>;
 +
 +                                      usb_dp_qmpphy_dp_in: endpoint {
 +                                              remote-endpoint = <&mdss_dp0_out>;
 +                                      };
 +                              };
 +                      };
 +              };
 +
 +              usb: usb@a600000 {
 +                      compatible = "qcom,eliza-dwc3", "qcom,snps-dwc3";
 +                      reg = <0x0 0x0a600000 0x0 0xfc100>;
 +
 +                      interrupts-extended = <&intc GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>,
 +                                            <&intc GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>,
 +                                            <&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 = "dwc_usb3",
 +                                        "pwr_event",
 +                                        "hs_phy_irq",
 +                                        "dp_hs_phy_irq",
 +                                        "dm_hs_phy_irq",
 +                                        "ss_phy_irq";
 +
 +                      clocks = <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>,
 +                               <&gcc GCC_USB30_PRIM_MASTER_CLK>,
 +                               <&gcc GCC_AGGRE_USB3_PRIM_AXI_CLK>,
 +                               <&gcc GCC_USB30_PRIM_SLEEP_CLK>,
 +                               <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>,
 +                               <&rpmhcc RPMH_CXO_CLK>;
 +                      clock-names = "cfg_noc",
 +                                    "core",
 +                                    "iface",
 +                                    "sleep",
 +                                    "mock_utmi",
 +                                    "xo";
 +
 +                      assigned-clocks = <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>,
 +                                        <&gcc GCC_USB30_PRIM_MASTER_CLK>;
 +                      assigned-clock-rates = <19200000>,
 +                                             <200000000>;
 +
 +                      resets = <&gcc GCC_USB30_PRIM_BCR>;
 +
 +                      phys = <&usb_hsphy>,
 +                             <&usb_dp_qmpphy QMP_USB43DP_USB3_PHY>;
 +                      phy-names = "usb2-phy",
 +                                  "usb3-phy";
 +
 +                      interconnects = <&aggre1_noc MASTER_USB3_0 QCOM_ICC_TAG_ALWAYS
 +                                       &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>,
 +                                      <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                       &config_noc SLAVE_USB3_0 QCOM_ICC_TAG_ACTIVE_ONLY>;
 +                      interconnect-names = "usb-ddr", "apps-usb";
 +
 +                      iommus = <&apps_smmu 0x40 0x0>;
 +
 +                      power-domains = <&gcc GCC_USB30_PRIM_GDSC>;
 +                      required-opps = <&rpmhpd_opp_nom>;
 +
 +                      snps,hird-threshold = /bits/ 8 <0x0>;
 +                      snps,usb2-gadget-lpm-disable;
 +                      snps,dis_u2_susphy_quirk;
 +                      snps,dis_enblslpm_quirk;
 +                      snps,dis-u1-entry-quirk;
 +                      snps,dis-u2-entry-quirk;
 +                      snps,is-utmi-l1-suspend;
 +                      snps,usb3_lpm_capable;
 +                      snps,usb2-lpm-disable;
 +                      snps,has-lpm-erratum;
 +                      tx-fifo-resize;
 +
 +                      dma-coherent;
 +                      usb-role-switch;
 +
 +                      status = "disabled";
 +
 +                      ports {
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              port@0 {
 +                                      reg = <0>;
 +
 +                                      usb_dwc3_hs: endpoint {
 +                                      };
 +                              };
 +
 +                              port@1 {
 +                                      reg = <1>;
 +
 +                                      usb_dwc3_ss: endpoint {
 +                                              remote-endpoint = <&usb_dp_qmpphy_usb_ss_in>;
 +                                      };
 +                              };
 +                      };
 +              };
 +
 +              mdss: display-subsystem@ae00000 {
 +                      compatible = "qcom,eliza-mdss";
 +                      reg = <0x0 0x0ae00000 0x0 0x1000>;
 +                      reg-names = "mdss";
 +                      ranges;
 +
 +                      interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
 +
 +                      clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>,
 +                               <&gcc GCC_DISP_HF_AXI_CLK>,
 +                               <&dispcc DISP_CC_MDSS_MDP_CLK>;
 +
 +                      resets = <&dispcc DISP_CC_MDSS_CORE_BCR>;
 +
 +                      interconnects = <&mmss_noc MASTER_MDP QCOM_ICC_TAG_ALWAYS
 +                                       &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>,
 +                                      <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
 +                                       &config_noc SLAVE_DISPLAY_CFG QCOM_ICC_TAG_ACTIVE_ONLY>;
 +                      interconnect-names = "mdp0-mem",
 +                                           "cpu-cfg";
 +
 +                      power-domains = <&dispcc MDSS_GDSC>;
 +
 +                      iommus = <&apps_smmu 0x800 0x2>;
 +
 +                      interrupt-controller;
 +                      #interrupt-cells = <1>;
 +
 +                      #address-cells = <2>;
 +                      #size-cells = <2>;
 +
 +                      status = "disabled";
 +
 +                      mdss_mdp: display-controller@ae01000 {
 +                              compatible = "qcom,eliza-dpu";
 +                              reg = <0x0 0x0ae01000 0x0 0x93000>,
 +                                    <0x0 0x0aeb0000 0x0 0x3000>;
 +                              reg-names = "mdp",
 +                                          "vbif";
 +
 +                              interrupts-extended = <&mdss 0>;
 +
 +                              clocks = <&gcc GCC_DISP_HF_AXI_CLK>,
 +                                       <&dispcc DISP_CC_MDSS_AHB_CLK>,
 +                                       <&dispcc DISP_CC_MDSS_MDP_LUT_CLK>,
 +                                       <&dispcc DISP_CC_MDSS_MDP_CLK>,
 +                                       <&dispcc DISP_CC_MDSS_VSYNC_CLK>;
 +                              clock-names = "nrt_bus",
 +                                            "iface",
 +                                            "lut",
 +                                            "core",
 +                                            "vsync";
 +
 +                              assigned-clocks = <&dispcc DISP_CC_MDSS_VSYNC_CLK>;
 +                              assigned-clock-rates = <19200000>;
 +
 +                              operating-points-v2 = <&mdp_opp_table>;
 +
 +                              power-domains = <&rpmhpd RPMHPD_CX>;
 +
 +                              ports {
 +                                      #address-cells = <1>;
 +                                      #size-cells = <0>;
 +
 +                                      port@0 {
 +                                              reg = <0>;
 +
 +                                              dpu_intf1_out: endpoint {
 +                                                      remote-endpoint = <&mdss_dsi0_in>;
 +                                              };
 +                                      };
 +
 +                                      port@1 {
 +                                              reg = <1>;
 +
 +                                              dpu_intf2_out: endpoint {
 +                                                      remote-endpoint = <&mdss_dsi1_in>;
 +                                              };
 +                                      };
 +
 +                                      port@2 {
 +                                              reg = <2>;
 +
 +                                              dpu_intf0_out: endpoint {
 +                                                      remote-endpoint = <&mdss_dp0_in>;
 +                                              };
 +                                      };
 +                                      /* TODO: HDMI */
 +                              };
 +
 +                              mdp_opp_table: opp-table {
 +                                      compatible = "operating-points-v2";
 +
 +                                      opp-150000000 {
 +                                              opp-hz = /bits/ 64 <150000000>;
 +                                              required-opps = <&rpmhpd_opp_low_svs_d1>;
 +                                      };
 +
 +                                      opp-207000000 {
 +                                              opp-hz = /bits/ 64 <207000000>;
 +                                              required-opps = <&rpmhpd_opp_low_svs>;
 +                                      };
 +
 +                                      opp-342000000 {
 +                                              opp-hz = /bits/ 64 <342000000>;
 +                                              required-opps = <&rpmhpd_opp_svs>;
 +                                      };
 +
 +                                      opp-417000000 {
 +                                              opp-hz = /bits/ 64 <417000000>;
 +                                              required-opps = <&rpmhpd_opp_svs_l1>;
 +                                      };
 +
 +                                      opp-532000000 {
 +                                              opp-hz = /bits/ 64 <532000000>;
 +                                              required-opps = <&rpmhpd_opp_nom>;
 +                                      };
 +
 +                                      opp-600000000 {
 +                                              opp-hz = /bits/ 64 <600000000>;
 +                                              required-opps = <&rpmhpd_opp_nom_l1>;
 +                                      };
 +
 +                                      opp-660000000 {
 +                                              opp-hz = /bits/ 64 <660000000>;
 +                                              required-opps = <&rpmhpd_opp_turbo>;
 +                                      };
 +                              };
 +                      };
 +
 +                      mdss_dsi0: dsi@ae94000 {
 +                              compatible = "qcom,eliza-dsi-ctrl", "qcom,sm8750-dsi-ctrl",
 +                                           "qcom,mdss-dsi-ctrl";
 +                              reg = <0x0 0x0ae94000 0x0 0x400>;
 +                              reg-names = "dsi_ctrl";
 +
 +                              interrupts-extended = <&mdss 4>;
 +
 +                              clocks = <&dispcc DISP_CC_MDSS_BYTE0_CLK>,
 +                                       <&dispcc DISP_CC_MDSS_BYTE0_INTF_CLK>,
 +                                       <&dispcc DISP_CC_MDSS_PCLK0_CLK>,
 +                                       <&dispcc DISP_CC_MDSS_ESC0_CLK>,
 +                                       <&dispcc DISP_CC_MDSS_AHB_CLK>,
 +                                       <&gcc GCC_DISP_HF_AXI_CLK>,
 +                                       <&mdss_dsi0_phy DSI_PIXEL_PLL_CLK>,
 +                                       <&mdss_dsi0_phy DSI_BYTE_PLL_CLK>,
 +                                       <&dispcc DISP_CC_ESYNC0_CLK>,
 +                                       <&dispcc DISP_CC_OSC_CLK>,
 +                                       <&dispcc DISP_CC_MDSS_BYTE0_CLK_SRC>,
 +                                       <&dispcc DISP_CC_MDSS_PCLK0_CLK_SRC>;
 +                              clock-names = "byte",
 +                                            "byte_intf",
 +                                            "pixel",
 +                                            "core",
 +                                            "iface",
 +                                            "bus",
 +                                            "dsi_pll_pixel",
 +                                            "dsi_pll_byte",
 +                                            "esync",
 +                                            "osc",
 +                                            "byte_src",
 +                                            "pixel_src";
 +
 +                              operating-points-v2 = <&mdss_dsi_opp_table>;
 +
 +                              phys = <&mdss_dsi0_phy>;
 +                              phy-names = "dsi";
 +
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              status = "disabled";
 +
 +                              ports {
 +                                      #address-cells = <1>;
 +                                      #size-cells = <0>;
 +
 +                                      port@0 {
 +                                              reg = <0>;
 +
 +                                              mdss_dsi0_in: endpoint {
 +                                                      remote-endpoint = <&dpu_intf1_out>;
 +                                              };
 +                                      };
 +
 +                                      port@1 {
 +                                              reg = <1>;
 +
 +                                              mdss_dsi0_out: endpoint {
 +                                              };
 +                                      };
 +                              };
 +
 +                              mdss_dsi_opp_table: opp-table {
 +                                      compatible = "operating-points-v2";
 +
 +                                      opp-140630000 {
 +                                              opp-hz = /bits/ 64 <140630000>;
 +                                              required-opps = <&rpmhpd_opp_low_svs_d1>;
 +                                      };
 +
 +                                      opp-187500000 {
 +                                              opp-hz = /bits/ 64 <187500000>;
 +                                              required-opps = <&rpmhpd_opp_low_svs>;
 +                                      };
 +
 +                                      opp-300000000 {
 +                                              opp-hz = /bits/ 64 <300000000>;
 +                                              required-opps = <&rpmhpd_opp_svs>;
 +                                      };
 +
 +                                      opp-358000000 {
 +                                              opp-hz = /bits/ 64 <358000000>;
 +                                              required-opps = <&rpmhpd_opp_svs_l1>;
 +                                      };
 +                              };
 +                      };
 +
 +                      mdss_dsi0_phy: phy@ae95000 {
 +                              compatible = "qcom,eliza-dsi-phy-4nm", "qcom,sm8650-dsi-phy-4nm";
 +                              reg = <0x0 0x0ae95000 0x0 0x200>,
 +                                    <0x0 0x0ae95200 0x0 0x300>,
 +                                    <0x0 0x0ae95500 0x0 0x400>;
 +                              reg-names = "dsi_phy",
 +                                          "dsi_phy_lane",
 +                                          "dsi_pll";
 +
 +                              clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>,
 +                                       <&bi_tcxo_div2>;
 +                              clock-names = "iface",
 +                                            "ref";
 +
 +                              #clock-cells = <1>;
 +                              #phy-cells = <0>;
 +
 +                              status = "disabled";
 +                      };
 +
 +                      mdss_dsi1: dsi@ae96000 {
 +                              compatible = "qcom,eliza-dsi-ctrl", "qcom,sm8750-dsi-ctrl",
 +                                           "qcom,mdss-dsi-ctrl";
 +                              reg = <0x0 0x0ae96000 0x0 0x400>;
 +                              reg-names = "dsi_ctrl";
 +
 +                              interrupts-extended = <&mdss 5>;
 +
 +                              clocks = <&dispcc DISP_CC_MDSS_BYTE1_CLK>,
 +                                       <&dispcc DISP_CC_MDSS_BYTE1_INTF_CLK>,
 +                                       <&dispcc DISP_CC_MDSS_PCLK1_CLK>,
 +                                       <&dispcc DISP_CC_MDSS_ESC1_CLK>,
 +                                       <&dispcc DISP_CC_MDSS_AHB_CLK>,
 +                                       <&gcc GCC_DISP_HF_AXI_CLK>,
 +                                       <&mdss_dsi1_phy DSI_PIXEL_PLL_CLK>,
 +                                       <&mdss_dsi1_phy DSI_BYTE_PLL_CLK>,
 +                                       <&dispcc DISP_CC_ESYNC1_CLK>,
 +                                       <&dispcc DISP_CC_OSC_CLK>,
 +                                       <&dispcc DISP_CC_MDSS_BYTE1_CLK_SRC>,
 +                                       <&dispcc DISP_CC_MDSS_PCLK1_CLK_SRC>;
 +                              clock-names = "byte",
 +                                            "byte_intf",
 +                                            "pixel",
 +                                            "core",
 +                                            "iface",
 +                                            "bus",
 +                                            "dsi_pll_pixel",
 +                                            "dsi_pll_byte",
 +                                            "esync",
 +                                            "osc",
 +                                            "byte_src",
 +                                            "pixel_src";
 +
 +                              operating-points-v2 = <&mdss_dsi_opp_table>;
 +
 +                              phys = <&mdss_dsi1_phy>;
 +                              phy-names = "dsi";
 +
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +
 +                              status = "disabled";
 +
 +                              ports {
 +                                      #address-cells = <1>;
 +                                      #size-cells = <0>;
 +
 +                                      port@0 {
 +                                              reg = <0>;
 +
 +                                              mdss_dsi1_in: endpoint {
 +                                                      remote-endpoint = <&dpu_intf2_out>;
 +                                              };
 +                                      };
 +
 +                                      port@1 {
 +                                              reg = <1>;
 +
 +                                              mdss_dsi1_out: endpoint {
 +                                              };
 +                                      };
 +                              };
 +                      };
 +
 +                      mdss_dsi1_phy: phy@ae97000 {
 +                              compatible = "qcom,eliza-dsi-phy-4nm", "qcom,sm8650-dsi-phy-4nm";
 +                              reg = <0x0 0x0ae97000 0x0 0x200>,
 +                                    <0x0 0x0ae97200 0x0 0x300>,
 +                                    <0x0 0x0ae97500 0x0 0x400>;
 +                              reg-names = "dsi_phy",
 +                                          "dsi_phy_lane",
 +                                          "dsi_pll";
 +
 +                              clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>,
 +                                       <&rpmhcc RPMH_CXO_CLK>;
 +                              clock-names = "iface",
 +                                            "ref";
 +
 +                              #clock-cells = <1>;
 +                              #phy-cells = <0>;
 +
 +                              status = "disabled";
 +                      };
 +
 +                      mdss_dp0: displayport-controller@af54000 {
 +                              compatible = "qcom,eliza-dp", "qcom,sm8650-dp";
 +                              reg = <0x0 0x0af54000 0x0 0x200>,
 +                                    <0x0 0x0af54200 0x0 0x200>,
 +                                    <0x0 0x0af55000 0x0 0xc00>,
 +                                    <0x0 0x0af56000 0x0 0x400>,
 +                                    <0x0 0x0af57000 0x0 0x400>,
 +                                    <0x0 0x0af58000 0x0 0x400>,
 +                                    <0x0 0x0af59000 0x0 0x400>,
 +                                    <0x0 0x0af5a000 0x0 0x600>,
 +                                    <0x0 0x0af5b000 0x0 0x600>;
 +
 +                              interrupts-extended = <&mdss 12>;
 +
 +                              clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>,
 +                                       <&dispcc DISP_CC_MDSS_DPTX0_AUX_CLK>,
 +                                       <&dispcc DISP_CC_MDSS_DPTX0_LINK_CLK>,
 +                                       <&dispcc DISP_CC_MDSS_DPTX0_LINK_INTF_CLK>,
 +                                       <&dispcc DISP_CC_MDSS_DPTX0_PIXEL0_CLK>,
 +                                       <&dispcc DISP_CC_MDSS_DPTX0_PIXEL1_CLK>;
 +                              clock-names = "core_iface",
 +                                            "core_aux",
 +                                            "ctrl_link",
 +                                            "ctrl_link_iface",
 +                                            "stream_pixel",
 +                                            "stream_1_pixel";
 +
 +                              assigned-clocks = <&dispcc DISP_CC_MDSS_DPTX0_LINK_CLK_SRC>,
 +                                                <&dispcc DISP_CC_MDSS_DPTX0_PIXEL0_CLK_SRC>,
 +                                                <&dispcc DISP_CC_MDSS_DPTX0_PIXEL1_CLK_SRC>;
 +                              assigned-clock-parents = <&usb_dp_qmpphy QMP_USB43DP_DP_LINK_CLK>,
 +                                                       <&usb_dp_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>,
 +                                                       <&usb_dp_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>;
 +
 +                              operating-points-v2 = <&dp_opp_table>;
 +
 +                              power-domains = <&rpmhpd RPMHPD_CX>;
 +
 +                              phys = <&usb_dp_qmpphy QMP_USB43DP_DP_PHY>;
 +                              phy-names = "dp";
 +
 +                              #sound-dai-cells = <0>;
 +
 +                              status = "disabled";
 +
 +                              dp_opp_table: opp-table {
 +                                      compatible = "operating-points-v2";
 +
 +                                      opp-270000000 {
 +                                              opp-hz = /bits/ 64 <270000000>;
 +                                              required-opps = <&rpmhpd_opp_low_svs>;
 +                                      };
 +
 +                                      opp-540000000 {
 +                                              opp-hz = /bits/ 64 <540000000>;
 +                                              required-opps = <&rpmhpd_opp_svs_l1>;
 +                                      };
 +
 +                                      opp-810000000 {
 +                                              opp-hz = /bits/ 64 <810000000>;
 +                                              required-opps = <&rpmhpd_opp_nom>;
 +                                      };
 +                              };
 +
 +                              ports {
 +                                      #address-cells = <1>;
 +                                      #size-cells = <0>;
 +
 +                                      port@0 {
 +                                              reg = <0>;
  
 -                      clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>,
 -                               <&gcc GCC_UFS_PHY_AHB_CLK>;
 -                      clock-names = "core",
 -                                    "iface";
 -                      power-domains = <&gcc GCC_UFS_PHY_GDSC>;
 -              };
 +                                              mdss_dp0_in: endpoint {
 +                                                      remote-endpoint = <&dpu_intf0_out>;
 +                                              };
 +                                      };
  
 -              tcsr_mutex: hwlock@1f40000 {
 -                      compatible = "qcom,tcsr-mutex";
 -                      reg = <0x0 0x01f40000 0x0 0x20000>;
 -                      #hwlock-cells = <1>;
 +                                      port@1 {
 +                                              reg = <1>;
 +
 +                                              mdss_dp0_out: endpoint {
 +                                                      data-lanes = <0 1 2 3>;
 +                                                      remote-endpoint = <&usb_dp_qmpphy_dp_in>;
 +                                              };
 +                                      };
 +                              };
 +                      };
                };
  
 -              tcsr: clock-controller@1fbf000 {
 -                      compatible = "qcom,eliza-tcsr", "syscon";
 -                      reg = <0x0 0x01fbf000 0x0 0x21000>;
 +              dispcc: clock-controller@af00000 {
 +                      compatible = "qcom,eliza-dispcc";
 +                      reg = <0x0 0x0af00000 0x0 0x20000>;
  
 -                      clocks = <&rpmhcc RPMH_CXO_CLK>;
 +                      clocks = <&bi_tcxo_div2>,
 +                               <&bi_tcxo_ao_div2>,
 +                               <&gcc GCC_DISP_AHB_CLK>,
 +                               <&sleep_clk>,
 +                               <&mdss_dsi0_phy DSI_BYTE_PLL_CLK>,
 +                               <&mdss_dsi0_phy DSI_PIXEL_PLL_CLK>,
 +                               <&mdss_dsi1_phy DSI_BYTE_PLL_CLK>,
 +                               <&mdss_dsi1_phy DSI_PIXEL_PLL_CLK>,
 +                               <&usb_dp_qmpphy QMP_USB43DP_DP_LINK_CLK>,
 +                               <&usb_dp_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>,
 +                               <0>, /* dp1 */
 +                               <0>,
 +                               <0>, /* dp2 */
 +                               <0>,
 +                               <0>, /* dp3 */
 +                               <0>,
 +                               <0>; /* HDMI phy */
 +
 +                      power-domains = <&rpmhpd RPMHPD_MX>;
 +                      required-opps = <&rpmhpd_opp_low_svs>;
  
                        #clock-cells = <1>;
                        #reset-cells = <1>;
index f09b30ea96ee307bc83456bb928f47fa3c7a7b32,a6e463f3885dc6f79d384e0909d6dce7e952de70..886d8514ce333bddb700c5f605999cb99ac71ac7
                                     "qcom,inline-crypto-engine";
                        reg = <0x0 0x01d88000 0x0 0x18000>;
  
-                       clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>;
+                       clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>,
+                                <&gcc GCC_UFS_PHY_AHB_CLK>;
+                       clock-names = "core",
+                                     "iface";
+                       power-domains = <&gcc UFS_PHY_GDSC>;
                };
  
 +              cryptobam: dma-controller@1dc4000 {
 +                      compatible = "qcom,bam-v1.7.4", "qcom,bam-v1.7.0";
 +                      reg = <0x0 0x01dc4000 0x0 0x28000>;
 +
 +                      interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH 0>;
 +
 +                      #dma-cells = <1>;
 +
 +                      iommus = <&apps_smmu 0x480 0>,
 +                               <&apps_smmu 0x481 0>;
 +
 +                      qcom,ee = <0>;
 +                      qcom,num-ees = <4>;
 +                      num-channels = <20>;
 +                      qcom,controlled-remotely;
 +              };
 +
 +              crypto: crypto@1dfa000 {
 +                      compatible = "qcom,milos-qce", "qcom,sm8150-qce", "qcom,qce";
 +                      reg = <0x0 0x01dfa000 0x0 0x6000>;
 +
 +                      interconnects = <&aggre2_noc MASTER_CRYPTO QCOM_ICC_TAG_ALWAYS
 +                                       &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
 +                      interconnect-names = "memory";
 +
 +                      dmas = <&cryptobam 4>, <&cryptobam 5>;
 +                      dma-names = "rx", "tx";
 +
 +                      iommus = <&apps_smmu 0x480 0>,
 +                               <&apps_smmu 0x481 0>;
 +              };
 +
                tcsr_mutex: hwlock@1f40000 {
                        compatible = "qcom,tcsr-mutex";
                        reg = <0x0 0x01f40000 0x0 0x20000>;