]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
arm64: dts: qcom: kaanapali: Add QUPv3 configuration for serial engines
authorJyothi Kumar Seerapu <jyothi.seerapu@oss.qualcomm.com>
Wed, 25 Feb 2026 07:19:17 +0000 (23:19 -0800)
committerBjorn Andersson <andersson@kernel.org>
Thu, 26 Mar 2026 14:40:44 +0000 (09:40 -0500)
Add device tree support for QUPv3 serial engine protocols on Kaanapali.
Kaanapali has 24 QUP serial engines across 4 QUP wrappers, each with
support of GPI DMA engines, and it also includes 5 I2C hubs.

Signed-off-by: Jyothi Kumar Seerapu <jyothi.seerapu@oss.qualcomm.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Jingyi Wang <jingyi.wang@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20260224-knp-dts-misc-v6-2-79d20dab8a60@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
arch/arm64/boot/dts/qcom/kaanapali.dtsi

index 83f08c323cd0ccc8bd0e7260dd22bff05b0725f7..00e7f0da17d9f12e53f6e69eb81d4926c577cf00 100644 (file)
@@ -6,6 +6,7 @@
 #include <dt-bindings/clock/qcom,kaanapali-gcc.h>
 #include <dt-bindings/clock/qcom,rpmh.h>
 #include <dt-bindings/clock/qcom,sm8750-tcsr.h>
+#include <dt-bindings/dma/qcom-gpi.h>
 #include <dt-bindings/firmware/qcom,scm.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/interconnect/qcom,icc.h>
                        #power-domain-cells = <1>;
                };
 
+               gpi_dma2: dma-controller@800000 {
+                       compatible = "qcom,kaanapali-gpi-dma", "qcom,sm6350-gpi-dma";
+                       reg = <0x0 0x00800000 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 848 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 849 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 850 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 851 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 852 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 853 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 854 IRQ_TYPE_LEVEL_HIGH>;
+
+                       dma-channels = <12>;
+                       dma-channel-mask = <0x1f>;
+                       #dma-cells = <3>;
+
+                       iommus = <&apps_smmu 0x436 0x0>;
+                       dma-coherent;
+               };
+
+               qupv3_2: geniqup@8c0000 {
+                       compatible = "qcom,geni-se-qup";
+                       reg = <0x0 0x008c0000 0x0 0x2000>;
+
+                       clocks = <&gcc GCC_QUPV3_WRAP_2_M_AHB_CLK>,
+                                <&gcc GCC_QUPV3_WRAP_2_S_AHB_CLK>;
+                       clock-names = "m-ahb",
+                                     "s-ahb";
+
+                       iommus = <&apps_smmu 0x423 0x0>;
+
+                       dma-coherent;
+
+                       #address-cells = <2>;
+                       #size-cells = <2>;
+                       ranges;
+
+                       i2c8: i2c@880000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x00880000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
+
+                               clocks = <&gcc GCC_QUPV3_WRAP2_S0_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>,
+                                               <&aggre_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 0 QCOM_GPI_I2C>,
+                                      <&gpi_dma2 1 0 QCOM_GPI_I2C>;
+                               dma-names = "tx",
+                                           "rx";
+
+                               pinctrl-0 = <&qup_i2c8_data_clk>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
+
+                       spi8: spi@880000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x00880000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
+
+                               clocks = <&gcc GCC_QUPV3_WRAP2_S0_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>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config";
+
+                               dmas = <&gpi_dma2 0 0 QCOM_GPI_SPI>,
+                                      <&gpi_dma2 1 0 QCOM_GPI_SPI>;
+                               dma-names = "tx",
+                                           "rx";
+
+                               pinctrl-0 = <&qup_spi8_data_clk>, <&qup_spi8_cs>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
+
+                       i2c9: i2c@884000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x00884000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
+
+                               clocks = <&gcc GCC_QUPV3_WRAP2_S1_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>,
+                                               <&aggre_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 1 QCOM_GPI_I2C>,
+                                      <&gpi_dma2 1 1 QCOM_GPI_I2C>;
+                               dma-names = "tx",
+                                           "rx";
+
+                               pinctrl-0 = <&qup_i2c9_data_clk>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
+
+                       spi9: spi@884000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x00884000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
+
+                               clocks = <&gcc GCC_QUPV3_WRAP2_S1_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>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config";
+
+                               dmas = <&gpi_dma2 0 1 QCOM_GPI_SPI>,
+                                      <&gpi_dma2 1 1 QCOM_GPI_SPI>;
+                               dma-names = "tx",
+                                           "rx";
+
+                               pinctrl-0 = <&qup_spi9_data_clk>, <&qup_spi9_cs>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
+
+                       i2c10: i2c@888000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x00888000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 355 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>,
+                                               <&aggre_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_I2C>,
+                                      <&gpi_dma2 1 2 QCOM_GPI_I2C>;
+                               dma-names = "tx",
+                                           "rx";
+
+                               pinctrl-0 = <&qup_i2c10_data_clk>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
+
+                       spi10: spi@888000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x00888000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 355 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>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config";
+
+                               dmas = <&gpi_dma2 0 2 QCOM_GPI_SPI>,
+                                      <&gpi_dma2 1 2 QCOM_GPI_SPI>;
+                               dma-names = "tx",
+                                           "rx";
+
+                               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 356 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>,
+                                               <&aggre_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 356 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>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config";
+
+                               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 357 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>,
+                                               <&aggre_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";
+                       };
+               };
+
+               i2c_master_hub: geniqup@9c0000 {
+                       compatible = "qcom,geni-se-i2c-master-hub";
+                       reg = <0x0 0x009c0000 0x0 0x2000>;
+
+                       clocks = <&gcc GCC_QUPV3_I2C_S_AHB_CLK>;
+                       clock-names = "s-ahb";
+
+                       #address-cells = <2>;
+                       #size-cells = <2>;
+                       ranges;
+
+                       status = "disabled";
+
+                       i2c_hub_0: i2c@980000 {
+                               compatible = "qcom,geni-i2c-master-hub";
+                               reg = <0x0 0x00980000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 464 IRQ_TYPE_LEVEL_HIGH>;
+
+                               clocks = <&gcc GCC_QUPV3_I2C_S0_CLK>,
+                                        <&gcc GCC_QUPV3_I2C_CORE_CLK>;
+                               clock-names = "se",
+                                             "core";
+
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
+                                                &clk_virt SLAVE_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_I2C QCOM_ICC_TAG_ALWAYS>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config";
+
+                               pinctrl-0 = <&hub_i2c0_data_clk>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
+
+                       i2c_hub_1: i2c@984000 {
+                               compatible = "qcom,geni-i2c-master-hub";
+                               reg = <0x0 0x00984000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 465 IRQ_TYPE_LEVEL_HIGH>;
+
+                               clocks = <&gcc GCC_QUPV3_I2C_S1_CLK>,
+                                        <&gcc GCC_QUPV3_I2C_CORE_CLK>;
+                               clock-names = "se",
+                                             "core";
+
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
+                                                &clk_virt SLAVE_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_I2C QCOM_ICC_TAG_ALWAYS>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config";
+
+                               pinctrl-0 = <&hub_i2c1_data_clk>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
+
+                       i2c_hub_2: i2c@988000 {
+                               compatible = "qcom,geni-i2c-master-hub";
+                               reg = <0x0 0x00988000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>;
+
+                               clocks = <&gcc GCC_QUPV3_I2C_S2_CLK>,
+                                        <&gcc GCC_QUPV3_I2C_CORE_CLK>;
+                               clock-names = "se",
+                                             "core";
+
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
+                                                &clk_virt SLAVE_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_I2C QCOM_ICC_TAG_ALWAYS>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config";
+
+                               pinctrl-0 = <&hub_i2c2_data_clk>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
+
+                       i2c_hub_3: i2c@98c000 {
+                               compatible = "qcom,geni-i2c-master-hub";
+                               reg = <0x0 0x0098c000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>;
+
+                               clocks = <&gcc GCC_QUPV3_I2C_S3_CLK>,
+                                        <&gcc GCC_QUPV3_I2C_CORE_CLK>;
+                               clock-names = "se",
+                                             "core";
+
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
+                                                &clk_virt SLAVE_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_I2C QCOM_ICC_TAG_ALWAYS>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config";
+
+                               pinctrl-0 = <&hub_i2c3_data_clk>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
+
+                       i2c_hub_4: i2c@990000 {
+                               compatible = "qcom,geni-i2c-master-hub";
+                               reg = <0x0 0x00990000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 468 IRQ_TYPE_LEVEL_HIGH>;
+
+                               clocks = <&gcc GCC_QUPV3_I2C_S4_CLK>,
+                                        <&gcc GCC_QUPV3_I2C_CORE_CLK>;
+                               clock-names = "se",
+                                             "core";
+
+                               interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
+                                                &clk_virt SLAVE_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_I2C QCOM_ICC_TAG_ALWAYS>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config";
+
+                               pinctrl-0 = <&hub_i2c4_data_clk>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
+               };
+
+               gpi_dma1: dma-controller@a00000 {
+                       compatible = "qcom,kaanapali-gpi-dma", "qcom,sm6350-gpi-dma";
+                       reg = <0x0 0x00a00000 0x0 0x60000>;
+
+                       interrupts = <GIC_SPI 836 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 837 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 838 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 839 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 840 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 841 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 842 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 843 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 844 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 845 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 846 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 847 IRQ_TYPE_LEVEL_HIGH>;
+
+                       dma-channels = <12>;
+                       dma-channel-mask = <0x1f>;
+                       #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_AXI_CLK>,
-                                <&gcc GCC_QUPV3_WRAP_1_S_AHB_CLK>;
-                       clock-names = "m-ahb",
-                                     "s-ahb";
+                       clocks = <&gcc GCC_QUPV3_WRAP_1_M_AXI_CLK>,
+                                <&gcc GCC_QUPV3_WRAP_1_S_AHB_CLK>;
+                       clock-names = "m-ahb",
+                                     "s-ahb";
+
+                       iommus = <&apps_smmu 0xa3 0x0>;
+
+                       dma-coherent;
+
+                       #address-cells = <2>;
+                       #size-cells = <2>;
+                       ranges;
+
+                       i2c0: i2c@a80000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x00a80000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 828 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>,
+                                               <&aggre_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 828 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>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config";
+
+                               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 829 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>,
+                                               <&aggre_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 829 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>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config";
+
+                               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 830 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>,
+                                               <&aggre_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 830 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>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config";
+
+                               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 831 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>,
+                                               <&aggre_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 831 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>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config";
+
+                               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 832 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>,
+                                               <&aggre_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 832 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>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config";
+
+                               dmas = <&gpi_dma1 0 4 QCOM_GPI_SPI>,
+                                      <&gpi_dma1 1 4 QCOM_GPI_SPI>;
+                               dma-names = "tx",
+                                           "rx";
+
+                               pinctrl-0 = <&qup_spi4_data_clk>, <&qup_spi4_cs>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
+
+                       i2c5: i2c@a94000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x00a94000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 833 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_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
+                                               <&aggre_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 5 QCOM_GPI_I2C>,
+                                      <&gpi_dma1 1 5 QCOM_GPI_I2C>;
+                               dma-names = "tx",
+                                           "rx";
+
+                               pinctrl-0 = <&qup_i2c5_data_clk>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
+
+                       spi5: spi@a94000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x00a94000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 833 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_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config";
+
+                               dmas = <&gpi_dma1 0 5 QCOM_GPI_SPI>,
+                                      <&gpi_dma1 1 5 QCOM_GPI_SPI>;
+                               dma-names = "tx",
+                                           "rx";
+
+                               pinctrl-0 = <&qup_spi5_data_clk>, <&qup_spi5_cs>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
+
+                       i2c6: i2c@a98000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x00a98000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 834 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_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
+                                               <&aggre_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 6 QCOM_GPI_I2C>,
+                                      <&gpi_dma1 1 6 QCOM_GPI_I2C>;
+                               dma-names = "tx",
+                                           "rx";
+
+                               pinctrl-0 = <&qup_i2c6_data_clk>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
+
+                       spi6: spi@a98000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x00a98000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 834 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_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config";
+
+                               dmas = <&gpi_dma1 0 6 QCOM_GPI_SPI>,
+                                      <&gpi_dma1 1 6 QCOM_GPI_SPI>;
+                               dma-names = "tx",
+                                           "rx";
+
+                               pinctrl-0 = <&qup_spi6_data_clk>, <&qup_spi6_cs>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
+
+                       uart7: serial@a9c000 {
+                               compatible = "qcom,geni-debug-uart";
+                               reg = <0x0 0x00a9c000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 835 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>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config";
+
+                               pinctrl-0 = <&qup_uart7_default>;
+                               pinctrl-names = "default";
+
+                               status = "disabled";
+                       };
+               };
+
+               ipcc: mailbox@1106000 {
+                       compatible = "qcom,kaanapali-ipcc", "qcom,ipcc";
+                       reg = <0x0 0x01106000 0x0 0x1000>;
+
+                       interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-controller;
+                       #interrupt-cells = <3>;
+
+                       #mbox-cells = <2>;
+               };
+
+               cnoc_main: interconnect@1500000 {
+                       compatible = "qcom,kaanapali-cnoc-main";
+                       reg = <0x0 0x01500000 0x0 0x1a080>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+                       #interconnect-cells = <2>;
+               };
+
+               config_noc: interconnect@1600000 {
+                       compatible = "qcom,kaanapali-cnoc-cfg";
+                       reg = <0x0 0x01600000 0x0 0x6200>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+                       #interconnect-cells = <2>;
+               };
+
+               system_noc: interconnect@1680000 {
+                       compatible = "qcom,kaanapali-system-noc";
+                       reg = <0x0 0x01680000 0x0 0x1f080>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+                       #interconnect-cells = <2>;
+               };
+
+               pcie_noc: interconnect@16c0000 {
+                       compatible = "qcom,kaanapali-pcie-anoc";
+                       reg = <0x0 0x016c0000 0x0 0x11400>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+                       #interconnect-cells = <2>;
+                       clocks = <&gcc GCC_AGGRE_NOC_PCIE_AXI_CLK>,
+                                <&gcc GCC_CFG_NOC_PCIE_ANOC_AHB_CLK>;
+               };
+
+               aggre_noc: interconnect@16e0000 {
+                       compatible = "qcom,kaanapali-aggre-noc";
+                       reg = <0x0 0x016e0000 0x0 0x42400>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+                       #interconnect-cells = <2>;
+                       clocks = <&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>,
+                                <&gcc GCC_AGGRE_USB3_PRIM_AXI_CLK>,
+                                <&rpmhcc RPMH_IPA_CLK>;
+               };
+
+               mmss_noc: interconnect@1780000 {
+                       compatible = "qcom,kaanapali-mmss-noc";
+                       reg = <0x0 0x01780000 0x0 0x5b800>;
+                       qcom,bcm-voters = <&apps_bcm_voter>;
+                       #interconnect-cells = <2>;
+               };
+
+               gpi_dma3: dma-controller@1900000 {
+                       compatible = "qcom,kaanapali-gpi-dma", "qcom,sm6350-gpi-dma";
+                       reg = <0x0 0x01900000 0x0 0x60000>;
+
+                       interrupts = <GIC_SPI 588 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 589 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 590 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 591 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 592 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 593 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 594 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 595 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 596 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 597 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 598 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 599 IRQ_TYPE_LEVEL_HIGH>;
+
+                       dma-channels = <12>;
+                       dma-channel-mask = <0x1e>;
+                       #dma-cells = <3>;
+
+                       iommus = <&apps_smmu 0x4d6 0x0>;
+                       dma-coherent;
+               };
+
+               qupv3_3: geniqup@19c0000 {
+                       compatible = "qcom,geni-se-qup";
+                       reg = <0x0 0x019c0000 0x0 0x2000>;
+
+                       clocks = <&gcc GCC_QUPV3_WRAP_3_M_AHB_CLK>,
+                                <&gcc GCC_QUPV3_WRAP_3_S_AHB_CLK>;
+                       clock-names = "m-ahb",
+                                     "s-ahb";
+
+                       iommus = <&apps_smmu 0x4c3 0x0>;
+
+                       dma-coherent;
+
+                       #address-cells = <2>;
+                       #size-cells = <2>;
+                       ranges;
+
+                       i2c13: i2c@1980000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x01980000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
+
+                               clocks = <&gcc GCC_QUPV3_WRAP3_S0_CLK>;
+                               clock-names = "se";
+
+                               interconnects = <&clk_virt MASTER_QUP_CORE_3 QCOM_ICC_TAG_ALWAYS
+                                                &clk_virt SLAVE_QUP_CORE_3 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_3 QCOM_ICC_TAG_ACTIVE_ONLY>,
+                                               <&aggre_noc MASTER_QUP_3 QCOM_ICC_TAG_ALWAYS
+                                                &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config",
+                                                    "qup-memory";
+
+                               dmas = <&gpi_dma3 0 0 QCOM_GPI_I2C>,
+                                      <&gpi_dma3 1 0 QCOM_GPI_I2C>;
+                               dma-names = "tx",
+                                           "rx";
+
+                               pinctrl-0 = <&qup_i2c13_data_clk>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
+
+                       i2c14: i2c@1984000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x01984000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 583 IRQ_TYPE_LEVEL_HIGH>;
+
+                               clocks = <&gcc GCC_QUPV3_WRAP3_S1_CLK>;
+                               clock-names = "se";
+
+                               interconnects = <&clk_virt MASTER_QUP_CORE_3 QCOM_ICC_TAG_ALWAYS
+                                                &clk_virt SLAVE_QUP_CORE_3 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_3 QCOM_ICC_TAG_ACTIVE_ONLY>,
+                                               <&aggre_noc MASTER_QUP_3 QCOM_ICC_TAG_ALWAYS
+                                                &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config",
+                                                    "qup-memory";
+
+                               dmas = <&gpi_dma3 0 1 QCOM_GPI_I2C>,
+                                      <&gpi_dma3 1 1 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@1984000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x01984000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 583 IRQ_TYPE_LEVEL_HIGH>;
+
+                               clocks = <&gcc GCC_QUPV3_WRAP3_S1_CLK>;
+                               clock-names = "se";
+
+                               interconnects = <&clk_virt MASTER_QUP_CORE_3 QCOM_ICC_TAG_ALWAYS
+                                                &clk_virt SLAVE_QUP_CORE_3 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_3 QCOM_ICC_TAG_ACTIVE_ONLY>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config";
+
+                               dmas = <&gpi_dma3 0 1 QCOM_GPI_SPI>,
+                                      <&gpi_dma3 1 1 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@1988000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x01988000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 584 IRQ_TYPE_LEVEL_HIGH>;
+
+                               clocks = <&gcc GCC_QUPV3_WRAP3_S2_CLK>;
+                               clock-names = "se";
+
+                               interconnects = <&clk_virt MASTER_QUP_CORE_3 QCOM_ICC_TAG_ALWAYS
+                                                &clk_virt SLAVE_QUP_CORE_3 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_3 QCOM_ICC_TAG_ACTIVE_ONLY>,
+                                               <&aggre_noc MASTER_QUP_3 QCOM_ICC_TAG_ALWAYS
+                                                &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config",
+                                                    "qup-memory";
+
+                               dmas = <&gpi_dma3 0 2 QCOM_GPI_I2C>,
+                                      <&gpi_dma3 1 2 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@1988000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x01988000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 584 IRQ_TYPE_LEVEL_HIGH>;
+
+                               clocks = <&gcc GCC_QUPV3_WRAP3_S2_CLK>;
+                               clock-names = "se";
+
+                               interconnects = <&clk_virt MASTER_QUP_CORE_3 QCOM_ICC_TAG_ALWAYS
+                                                &clk_virt SLAVE_QUP_CORE_3 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_3 QCOM_ICC_TAG_ACTIVE_ONLY>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config";
+
+                               dmas = <&gpi_dma3 0 2 QCOM_GPI_SPI>,
+                                      <&gpi_dma3 1 2 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";
+                       };
+
+                       i2c16: i2c@198c000  {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x0198c000 0x0 0x4000>;
+                               interrupts = <GIC_SPI 585 IRQ_TYPE_LEVEL_HIGH>;
+
+                               clocks = <&gcc GCC_QUPV3_WRAP3_S3_CLK>;
+                               clock-names = "se";
+
+                               interconnects = <&clk_virt MASTER_QUP_CORE_3 QCOM_ICC_TAG_ALWAYS
+                                                &clk_virt SLAVE_QUP_CORE_3 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_3 QCOM_ICC_TAG_ACTIVE_ONLY>,
+                                               <&aggre_noc MASTER_QUP_3 QCOM_ICC_TAG_ALWAYS
+                                                &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config",
+                                                    "qup-memory";
+
+                               dmas = <&gpi_dma3 0 3 QCOM_GPI_I2C>,
+                                      <&gpi_dma3 1 3 QCOM_GPI_I2C>;
+                               dma-names = "tx",
+                                           "rx";
+
+                               pinctrl-0 = <&qup_i2c16_data_clk>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
+
+                       spi16: spi@198c000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x198c000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 585 IRQ_TYPE_LEVEL_HIGH>;
+
+                               clocks = <&gcc GCC_QUPV3_WRAP3_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>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config";
+
+                               dmas = <&gpi_dma3 0 3 QCOM_GPI_SPI>,
+                                      <&gpi_dma3 1 3 QCOM_GPI_SPI>;
+                               dma-names = "tx",
+                                           "rx";
+
+                               pinctrl-0 = <&qup_spi16_data_clk>, <&qup_spi16_cs>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
+
+                       i2c17: i2c@1990000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x01990000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 586 IRQ_TYPE_LEVEL_HIGH>;
+
+                               clocks = <&gcc GCC_QUPV3_WRAP3_S4_CLK>;
+                               clock-names = "se";
+
+                               interconnects = <&clk_virt MASTER_QUP_CORE_3 QCOM_ICC_TAG_ALWAYS
+                                                &clk_virt SLAVE_QUP_CORE_3 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_3 QCOM_ICC_TAG_ACTIVE_ONLY>,
+                                               <&aggre_noc MASTER_QUP_3 QCOM_ICC_TAG_ALWAYS
+                                                &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config",
+                                                    "qup-memory";
+
+                               dmas = <&gpi_dma3 0 4 QCOM_GPI_I2C>,
+                                      <&gpi_dma3 1 4 QCOM_GPI_I2C>;
+                               dma-names = "tx",
+                                           "rx";
+
+                               pinctrl-0 = <&qup_i2c17_data_clk>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
+
+                       spi17: spi@1990000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x01990000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 586 IRQ_TYPE_LEVEL_HIGH>;
+
+                               clocks = <&gcc GCC_QUPV3_WRAP3_S4_CLK>;
+                               clock-names = "se";
+
+                               interconnects = <&clk_virt MASTER_QUP_CORE_3 QCOM_ICC_TAG_ALWAYS
+                                                &clk_virt SLAVE_QUP_CORE_3 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_3 QCOM_ICC_TAG_ACTIVE_ONLY>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config";
+
+                               dmas = <&gpi_dma3 0 4 QCOM_GPI_SPI>,
+                                      <&gpi_dma3 1 4 QCOM_GPI_SPI>;
+                               dma-names = "tx",
+                                           "rx";
+
+                               pinctrl-0 = <&qup_spi17_data_clk>, <&qup_spi17_cs>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
+
+                       uart18: serial@1994000 {
+                               compatible = "qcom,geni-uart";
+                               reg = <0x0 0x01994000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 587 IRQ_TYPE_LEVEL_HIGH>;
+
+                               clocks = <&gcc GCC_QUPV3_WRAP3_S5_CLK>;
+                               clock-names = "se";
+
+                               interconnects = <&clk_virt MASTER_QUP_CORE_3 QCOM_ICC_TAG_ALWAYS
+                                                &clk_virt SLAVE_QUP_CORE_3 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_3 QCOM_ICC_TAG_ACTIVE_ONLY>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config";
+
+                               pinctrl-0 = <&qup_uart18_default>, <&qup_uart18_cts_rts>;
+                               pinctrl-names = "default";
+
+                               status = "disabled";
+                       };
+               };
+
+               gpi_dma4: dma-controller@1a00000 {
+                       compatible = "qcom,kaanapali-gpi-dma", "qcom,sm6350-gpi-dma";
+                       reg = <0x0 0x01a00000 0x0 0x60000>;
+
+                       interrupts = <GIC_SPI 504 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 505 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 506 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 507 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 508 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 509 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 510 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 511 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 512 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 513 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 514 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 515 IRQ_TYPE_LEVEL_HIGH>;
+
+                       dma-channels = <12>;
+                       dma-channel-mask = <0x1e>;
+                       #dma-cells = <3>;
+
+                       iommus = <&apps_smmu 0x536 0x0>;
+                       dma-coherent;
+               };
+
+               qupv3_4: geniqup@1ac0000 {
+                       compatible = "qcom,geni-se-qup";
+                       reg = <0x0 0x01ac0000 0x0 0x2000>;
+
+                       clocks = <&gcc GCC_QUPV3_WRAP_4_M_AHB_CLK>,
+                                <&gcc GCC_QUPV3_WRAP_4_S_AHB_CLK>;
+                       clock-names = "m-ahb",
+                                     "s-ahb";
+
+                       iommus = <&apps_smmu 0x523 0x0>;
+
+                       dma-coherent;
+
+                       #address-cells = <2>;
+                       #size-cells = <2>;
+                       ranges;
+
+                       i2c19: i2c@1a80000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x01a80000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 856 IRQ_TYPE_LEVEL_HIGH>;
+
+                               clocks = <&gcc GCC_QUPV3_WRAP4_S0_CLK>;
+                               clock-names = "se";
+
+                               interconnects = <&clk_virt MASTER_QUP_CORE_4 QCOM_ICC_TAG_ALWAYS
+                                                &clk_virt SLAVE_QUP_CORE_4 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_4 QCOM_ICC_TAG_ACTIVE_ONLY>,
+                                               <&aggre_noc MASTER_QUP_4 QCOM_ICC_TAG_ALWAYS
+                                                &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config",
+                                                    "qup-memory";
+
+                               dmas = <&gpi_dma4 0 0 QCOM_GPI_I2C>,
+                                      <&gpi_dma4 1 0 QCOM_GPI_I2C>;
+                               dma-names = "tx",
+                                           "rx";
+
+                               pinctrl-0 = <&qup_i2c19_data_clk>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
+
+                       spi19: spi@1a80000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x01a80000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 856 IRQ_TYPE_LEVEL_HIGH>;
+
+                               clocks = <&gcc GCC_QUPV3_WRAP4_S0_CLK>;
+                               clock-names = "se";
+
+                               interconnects = <&clk_virt MASTER_QUP_CORE_4 QCOM_ICC_TAG_ALWAYS
+                                                &clk_virt SLAVE_QUP_CORE_4 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_4 QCOM_ICC_TAG_ACTIVE_ONLY>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config";
+
+                               dmas = <&gpi_dma4 0 0 QCOM_GPI_SPI>,
+                                      <&gpi_dma4 1 0 QCOM_GPI_SPI>;
+                               dma-names = "tx",
+                                           "rx";
+
+                               pinctrl-0 = <&qup_spi19_data_clk>, <&qup_spi19_cs>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
+
+                       i2c20: i2c@1a84000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x01a84000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 857 IRQ_TYPE_LEVEL_HIGH>;
+
+                               clocks = <&gcc GCC_QUPV3_WRAP4_S1_CLK>;
+                               clock-names = "se";
+
+                               interconnects = <&clk_virt MASTER_QUP_CORE_4 QCOM_ICC_TAG_ALWAYS
+                                                &clk_virt SLAVE_QUP_CORE_4 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_4 QCOM_ICC_TAG_ACTIVE_ONLY>,
+                                               <&aggre_noc MASTER_QUP_4 QCOM_ICC_TAG_ALWAYS
+                                                &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config",
+                                                    "qup-memory";
+
+                               dmas = <&gpi_dma4 0 1 QCOM_GPI_I2C>,
+                                      <&gpi_dma4 1 1 QCOM_GPI_I2C>;
+                               dma-names = "tx",
+                                           "rx";
+
+                               pinctrl-0 = <&qup_i2c20_data_clk>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
 
-                       iommus = <&apps_smmu 0xa3 0x0>;
+                       spi20: spi@1a84000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x01a84000 0x0 0x4000>;
 
-                       dma-coherent;
+                               interrupts = <GIC_SPI 857 IRQ_TYPE_LEVEL_HIGH>;
 
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges;
+                               clocks = <&gcc GCC_QUPV3_WRAP4_S1_CLK>;
+                               clock-names = "se";
 
-                       uart7: serial@a9c000 {
-                               compatible = "qcom,geni-debug-uart";
-                               reg = <0x0 0x00a9c000 0x0 0x4000>;
+                               interconnects = <&clk_virt MASTER_QUP_CORE_4 QCOM_ICC_TAG_ALWAYS
+                                                &clk_virt SLAVE_QUP_CORE_4 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_4 QCOM_ICC_TAG_ACTIVE_ONLY>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config";
 
-                               interrupts = <GIC_SPI 835 IRQ_TYPE_LEVEL_HIGH>;
+                               dmas = <&gpi_dma4 0 1 QCOM_GPI_SPI>,
+                                      <&gpi_dma4 1 1 QCOM_GPI_SPI>;
+                               dma-names = "tx",
+                                           "rx";
 
-                               clocks = <&gcc GCC_QUPV3_WRAP1_S7_CLK>;
+                               pinctrl-0 = <&qup_spi20_data_clk>, <&qup_spi20_cs>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
+
+                       i2c21: i2c@1a88000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x01a88000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 858 IRQ_TYPE_LEVEL_HIGH>;
+
+                               clocks = <&gcc GCC_QUPV3_WRAP4_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>,
+                               interconnects = <&clk_virt MASTER_QUP_CORE_4 QCOM_ICC_TAG_ALWAYS
+                                                &clk_virt SLAVE_QUP_CORE_4 QCOM_ICC_TAG_ALWAYS>,
                                                <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
-                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>;
+                                                &config_noc SLAVE_QUP_4 QCOM_ICC_TAG_ACTIVE_ONLY>,
+                                               <&aggre_noc MASTER_QUP_4 QCOM_ICC_TAG_ALWAYS
+                                                &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config",
+                                                    "qup-memory";
+
+                               dmas = <&gpi_dma4 0 2 QCOM_GPI_I2C>,
+                                      <&gpi_dma4 1 2 QCOM_GPI_I2C>;
+                               dma-names = "tx",
+                                           "rx";
+
+                               pinctrl-0 = <&qup_i2c21_data_clk>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
+
+                       spi21: spi@1a88000 {
+                               compatible = "qcom,geni-spi";
+                               reg = <0x0 0x01a88000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 858 IRQ_TYPE_LEVEL_HIGH>;
+
+                               clocks = <&gcc GCC_QUPV3_WRAP4_S2_CLK>;
+                               clock-names = "se";
+
+                               interconnects = <&clk_virt MASTER_QUP_CORE_4 QCOM_ICC_TAG_ALWAYS
+                                                &clk_virt SLAVE_QUP_CORE_4 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_4 QCOM_ICC_TAG_ACTIVE_ONLY>;
                                interconnect-names = "qup-core",
                                                     "qup-config";
 
-                               pinctrl-0 = <&qup_uart7_default>;
+                               dmas = <&gpi_dma4 0 2 QCOM_GPI_SPI>,
+                                      <&gpi_dma4 1 2 QCOM_GPI_SPI>;
+                               dma-names = "tx",
+                                           "rx";
+
+                               pinctrl-0 = <&qup_spi21_data_clk>, <&qup_spi21_cs>;
                                pinctrl-names = "default";
 
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
                                status = "disabled";
                        };
-               };
 
-               ipcc: mailbox@1106000 {
-                       compatible = "qcom,kaanapali-ipcc", "qcom,ipcc";
-                       reg = <0x0 0x01106000 0x0 0x1000>;
+                       i2c22: i2c@1a8c000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x01a8c000 0x0 0x4000>;
 
-                       interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-controller;
-                       #interrupt-cells = <3>;
+                               interrupts = <GIC_SPI 859 IRQ_TYPE_LEVEL_HIGH>;
 
-                       #mbox-cells = <2>;
-               };
+                               clocks = <&gcc GCC_QUPV3_WRAP4_S3_CLK>;
+                               clock-names = "se";
 
-               cnoc_main: interconnect@1500000 {
-                       compatible = "qcom,kaanapali-cnoc-main";
-                       reg = <0x0 0x01500000 0x0 0x1a080>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
-                       #interconnect-cells = <2>;
-               };
+                               interconnects = <&clk_virt MASTER_QUP_CORE_4 QCOM_ICC_TAG_ALWAYS
+                                                &clk_virt SLAVE_QUP_CORE_4 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_4 QCOM_ICC_TAG_ACTIVE_ONLY>,
+                                               <&aggre_noc MASTER_QUP_4 QCOM_ICC_TAG_ALWAYS
+                                                &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config",
+                                                    "qup-memory";
 
-               config_noc: interconnect@1600000 {
-                       compatible = "qcom,kaanapali-cnoc-cfg";
-                       reg = <0x0 0x01600000 0x0 0x6200>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
-                       #interconnect-cells = <2>;
-               };
+                               dmas = <&gpi_dma4 0 3 QCOM_GPI_I2C>,
+                                      <&gpi_dma4 1 3 QCOM_GPI_I2C>;
+                               dma-names = "tx",
+                                           "rx";
 
-               system_noc: interconnect@1680000 {
-                       compatible = "qcom,kaanapali-system-noc";
-                       reg = <0x0 0x01680000 0x0 0x1f080>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
-                       #interconnect-cells = <2>;
-               };
+                               pinctrl-0 = <&qup_i2c22_data_clk>;
+                               pinctrl-names = "default";
 
-               pcie_noc: interconnect@16c0000 {
-                       compatible = "qcom,kaanapali-pcie-anoc";
-                       reg = <0x0 0x016c0000 0x0 0x11400>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
-                       #interconnect-cells = <2>;
-                       clocks = <&gcc GCC_AGGRE_NOC_PCIE_AXI_CLK>,
-                                <&gcc GCC_CFG_NOC_PCIE_ANOC_AHB_CLK>;
-               };
+                               #address-cells = <1>;
+                               #size-cells = <0>;
 
-               aggre_noc: interconnect@16e0000 {
-                       compatible = "qcom,kaanapali-aggre-noc";
-                       reg = <0x0 0x016e0000 0x0 0x42400>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
-                       #interconnect-cells = <2>;
-                       clocks = <&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>,
-                                <&gcc GCC_AGGRE_USB3_PRIM_AXI_CLK>,
-                                <&rpmhcc RPMH_IPA_CLK>;
-               };
+                               status = "disabled";
+                       };
 
-               mmss_noc: interconnect@1780000 {
-                       compatible = "qcom,kaanapali-mmss-noc";
-                       reg = <0x0 0x01780000 0x0 0x5b800>;
-                       qcom,bcm-voters = <&apps_bcm_voter>;
-                       #interconnect-cells = <2>;
+                       i2c23: i2c@1a90000 {
+                               compatible = "qcom,geni-i2c";
+                               reg = <0x0 0x01a90000 0x0 0x4000>;
+
+                               interrupts = <GIC_SPI 860 IRQ_TYPE_LEVEL_HIGH>;
+
+                               clocks = <&gcc GCC_QUPV3_WRAP4_S4_CLK>;
+                               clock-names = "se";
+
+                               interconnects = <&clk_virt MASTER_QUP_CORE_4 QCOM_ICC_TAG_ALWAYS
+                                                &clk_virt SLAVE_QUP_CORE_4 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_4 QCOM_ICC_TAG_ACTIVE_ONLY>,
+                                               <&aggre_noc MASTER_QUP_4 QCOM_ICC_TAG_ALWAYS
+                                                &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
+                               interconnect-names = "qup-core",
+                                                    "qup-config",
+                                                    "qup-memory";
+
+                               dmas = <&gpi_dma4 0 4 QCOM_GPI_I2C>,
+                                      <&gpi_dma4 1 4 QCOM_GPI_I2C>;
+                               dma-names = "tx",
+                                           "rx";
+
+                               pinctrl-0 = <&qup_i2c23_data_clk>;
+                               pinctrl-names = "default";
+
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               status = "disabled";
+                       };
                };
 
                pcie0: pcie@1c00000 {
                        #interrupt-cells = <2>;
                        wakeup-parent = <&pdc>;
 
+                       hub_i2c0_data_clk: hub-i2c0-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio66", "gpio67";
+                               function = "i2chub0_se0";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       hub_i2c1_data_clk: hub-i2c1-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio78", "gpio79";
+                               function = "i2chub0_se1";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       hub_i2c2_data_clk: hub-i2c2-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio68", "gpio69";
+                               function = "i2chub0_se2";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       hub_i2c3_data_clk: hub-i2c3-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio70", "gpio71";
+                               function = "i2chub0_se3";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       hub_i2c4_data_clk: hub-i2c4-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio72", "gpio73";
+                               function = "i2chub0_se4";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_i2c0_data_clk: qup-i2c0-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio80", "gpio83";
+                               function = "qup1_se0";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_i2c1_data_clk: qup-i2c1-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio74", "gpio75";
+                               function = "qup1_se1";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_i2c2_data_clk: qup-i2c2-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio40", "gpio41";
+                               function = "qup1_se2";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_i2c3_data_clk: qup-i2c3-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio44", "gpio45";
+                               function = "qup1_se3";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_i2c4_data_clk: qup-i2c4-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio36", "gpio37";
+                               function = "qup1_se4";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_i2c5_data_clk: qup-i2c5-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio52", "gpio53";
+                               function = "qup1_se5";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_i2c6_data_clk: qup-i2c6-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio56", "gpio57";
+                               function = "qup1_se6";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_i2c8_data_clk: qup-i2c8-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio0", "gpio1";
+                               function = "qup2_se0";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_i2c9_data_clk: qup-i2c9-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio4", "gpio5";
+                               function = "qup2_se1";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_i2c10_data_clk: qup-i2c10-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio117", "gpio118";
+                               function = "qup2_se2";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_i2c11_data_clk: qup-i2c11-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio122", "gpio123";
+                               function = "qup2_se3";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_i2c12_data_clk: qup-i2c12-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio208", "gpio209";
+                               function = "qup2_se4";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_i2c13_data_clk: qup-i2c13-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio64", "gpio65";
+                               function = "qup3_se0";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_i2c14_data_clk: qup-i2c14-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio8", "gpio9";
+                               function = "qup3_se1";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_i2c15_data_clk: qup-i2c15-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio12", "gpio13";
+                               function = "qup3_se2";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_i2c16_data_clk: qup-i2c16-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio16", "gpio17";
+                               function = "qup3_se3";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_i2c17_data_clk: qup-i2c17-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio20", "gpio21";
+                               function = "qup3_se4";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_i2c19_data_clk: qup-i2c19-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio48", "gpio49";
+                               function = "qup4_se0";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_i2c20_data_clk: qup-i2c20-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio28", "gpio29";
+                               function = "qup4_se1";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_i2c21_data_clk: qup-i2c21-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio32", "gpio33";
+                               function = "qup4_se2";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_i2c22_data_clk: qup-i2c22-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio121", "gpio84";
+                               function = "qup4_se3";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_i2c23_data_clk: qup-i2c23-data-clk-state {
+                               /* SDA, SCL */
+                               pins = "gpio161", "gpio162";
+                               function = "qup4_se4";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_spi0_cs: qup-spi0-cs-state {
+                               pins = "gpio81";
+                               function = "qup1_se0";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi0_data_clk: qup-spi0-data-clk-state {
+                               /* MISO, MOSI, CLK */
+                               pins = "gpio80", "gpio83", "gpio82";
+                               function = "qup1_se0";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi1_cs: qup-spi1-cs-state {
+                               pins = "gpio77";
+                               function = "qup1_se1";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi1_data_clk: qup-spi1-data-clk-state {
+                               /* MISO, MOSI, CLK */
+                               pins = "gpio74", "gpio75", "gpio76";
+                               function = "qup1_se1";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi2_cs: qup-spi2-cs-state {
+                               pins = "gpio43";
+                               function = "qup1_se2";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi2_data_clk: qup-spi2-data-clk-state {
+                               /* MISO, MOSI, CLK */
+                               pins = "gpio40", "gpio41", "gpio42";
+                               function = "qup1_se2";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi3_cs: qup-spi3-cs-state {
+                               pins = "gpio47";
+                               function = "qup1_se3";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi3_data_clk: qup-spi3-data-clk-state {
+                               /* MISO, MOSI, CLK */
+                               pins = "gpio44", "gpio45", "gpio46";
+                               function = "qup1_se3";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi4_cs: qup-spi4-cs-state {
+                               pins = "gpio39";
+                               function = "qup1_se4";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi4_data_clk: qup-spi4-data-clk-state {
+                               /* MISO, MOSI, CLK */
+                               pins = "gpio36", "gpio37", "gpio38";
+                               function = "qup1_se4";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi5_cs: qup-spi5-cs-state {
+                               pins = "gpio55";
+                               function = "qup1_se5";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi5_data_clk: qup-spi5-data-clk-state {
+                               /* MISO, MOSI, CLK */
+                               pins = "gpio52", "gpio53", "gpio54";
+                               function = "qup1_se5";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi6_cs: qup-spi6-cs-state {
+                               pins = "gpio59";
+                               function = "qup1_se6";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi6_data_clk: qup-spi6-data-clk-state {
+                               /* MISO, MOSI, CLK */
+                               pins = "gpio56", "gpio57", "gpio58";
+                               function = "qup1_se6";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi8_cs: qup-spi8-cs-state {
+                               pins = "gpio3";
+                               function = "qup2_se0";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi8_data_clk: qup-spi8-data-clk-state {
+                               /* MISO, MOSI, CLK */pins = "gpio0", "gpio1", "gpio2";
+                               function = "qup2_se0";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi9_cs: qup-spi9-cs-state {
+                               pins = "gpio7";
+                               function = "qup2_se1";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi9_data_clk: qup-spi9-data-clk-state {
+                               /* MISO, MOSI, CLK */
+                               pins = "gpio4", "gpio5", "gpio6";
+                               function = "qup2_se1";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi10_cs: qup-spi10-cs-state {
+                               pins = "gpio120";
+                               function = "qup2_se2";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi10_data_clk: qup-spi10-data-clk-state {
+                               /* MISO, MOSI, CLK */
+                               pins = "gpio117", "gpio118", "gpio119";
+                               function = "qup2_se2";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi11_cs: qup-spi11-cs-state {
+                               pins = "gpio125";
+                               function = "qup2_se3";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi11_data_clk: qup-spi11-data-clk-state {
+                               /* MISO, MOSI, CLK */
+                               pins = "gpio122", "gpio123", "gpio124";
+                               function = "qup2_se3";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi14_cs: qup-spi14-cs-state {
+                               pins = "gpio11";
+                               function = "qup3_se1";
+                               drive-strength = <6>;
+                               bias-pull-up;
+                       };
+
+                       qup_spi14_data_clk: qup-spi14-data-clk-state {
+                               /* MISO, MOSI, CLK */
+                               pins = "gpio8", "gpio9", "gpio10";
+                               function = "qup3_se1";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi15_cs: qup-spi15-cs-state {
+                               pins = "gpio15";
+                               function = "qup3_se2";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi15_data_clk: qup-spi15-data-clk-state {
+                               /* MISO, MOSI, CLK */
+                               pins = "gpio12", "gpio13", "gpio14";
+                               function = "qup3_se2";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi16_cs: qup-spi16-cs-state {
+                               pins = "gpio19";
+                               function = "qup3_se3";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi16_data_clk: qup-spi16-data-clk-state {
+                               /* MISO, MOSI, CLK */
+                               pins = "gpio16", "gpio17", "gpio18";
+                               function = "qup3_se3";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi17_cs: qup-spi17-cs-state {
+                               pins = "gpio23";
+                               function = "qup3_se4";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi17_data_clk: qup-spi17-data-clk-state {
+                               /* MISO, MOSI, CLK */
+                               pins = "gpio20", "gpio21", "gpio22";
+                               function = "qup3_se4";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi19_cs: qup-spi19-cs-state {
+                               pins = "gpio51";
+                               function = "qup4_se0";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi19_data_clk: qup-spi19-data-clk-state {
+                               /* MISO, MOSI, CLK */
+                               pins = "gpio48", "gpio49", "gpio50";
+                               function = "qup4_se0";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi20_cs: qup-spi20-cs-state {
+                               pins = "gpio31";
+                               function = "qup4_se1";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi20_data_clk: qup-spi20-data-clk-state {
+                               /* MISO, MOSI, CLK */
+                               pins = "gpio28", "gpio29", "gpio30";
+                               function = "qup4_se1";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi21_cs: qup-spi21-cs-state {
+                               pins = "gpio35";
+                               function = "qup4_se2";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
+                       qup_spi21_data_clk: qup-spi21-data-clk-state {
+                               /* MISO, MOSI, CLK */
+                               pins = "gpio32", "gpio33", "gpio34";
+                               function = "qup4_se2";
+                               drive-strength = <6>;
+                               bias-disable;
+                       };
+
                        qup_uart7_default: qup-uart7-state {
                                 /* TX, RX */
                                 pins = "gpio62", "gpio63";
                                 bias-disable;
                        };
 
+                       qup_uart18_default: qup-uart18-default-state {
+                               /* TX, RX */
+                               pins = "gpio26", "gpio27";
+                               function = "qup3_se5";
+                               drive-strength = <2>;
+                               bias-pull-up;
+                       };
+
+                       qup_uart18_cts_rts: qup-uart18-cts-rts-state {
+                               /* CTS, RTS */
+                               pins = "gpio24", "gpio25";
+                               function = "qup3_se5";
+                               drive-strength = <2>;
+                               bias-pull-down;
+                       };
+
                        sdc2_default: sdc2-default-state {
                                clk-pins {
                                        pins = "sdc2_clk";