arm64: dts: qcom: sc8280xp: Fix shifted GPI DMA channels

The GPI DMA channels in sc8280xp.dtsi are wrong. Let's fix it.

Origianl patch was rebased to the linux-next and formated to a new
patch again later, then it got the GPI DMA channels in the new patch
shifted.

Fixes: 71b12166a2be ("arm64: dts: qcom: sc8280xp: Describe GPI DMA controller nodes")
Signed-off-by: Pengyu Luo <mitltlatltl@gmail.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20251013115506.103649-1-mitltlatltl@gmail.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
index e48efbd13bfa8dba71928ef11b80ac27eb4b6f85..7b89d3d422ea62012daeb423e457a20e84eeb0b5 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
@@ -967,8 +967,8 @@
                                                <&aggre1_noc MASTER_QUP_2 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma2 0 6 QCOM_GPI_SPI>,
-                                      <&gpi_dma2 1 6 QCOM_GPI_SPI>;
+                               dmas = <&gpi_dma2 0 0 QCOM_GPI_I2C>,
+                                      <&gpi_dma2 1 0 QCOM_GPI_I2C>;
                                dma-names = "tx",
                                            "rx";
 
@@ -989,8 +989,8 @@
                                                <&aggre1_noc MASTER_QUP_2 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma2 0 0 QCOM_GPI_I2C>,
-                                      <&gpi_dma2 1 0 QCOM_GPI_I2C>;
+                               dmas = <&gpi_dma2 0 0 QCOM_GPI_SPI>,
+                                      <&gpi_dma2 1 0 QCOM_GPI_SPI>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1011,8 +1011,8 @@
                                                <&aggre1_noc MASTER_QUP_2 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma2 0 0 QCOM_GPI_SPI>,
-                                      <&gpi_dma2 1 0 QCOM_GPI_SPI>;
+                               dmas = <&gpi_dma2 0 1 QCOM_GPI_I2C>,
+                                      <&gpi_dma2 1 1 QCOM_GPI_I2C>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1033,8 +1033,8 @@
                                                <&aggre1_noc MASTER_QUP_2 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma2 0 1 QCOM_GPI_I2C>,
-                                      <&gpi_dma2 1 1 QCOM_GPI_I2C>;
+                               dmas = <&gpi_dma2 0 1 QCOM_GPI_SPI>,
+                                      <&gpi_dma2 1 1 QCOM_GPI_SPI>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1069,8 +1069,8 @@
                                                <&aggre1_noc MASTER_QUP_2 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma2 0 1 QCOM_GPI_SPI>,
-                                      <&gpi_dma2 1 1 QCOM_GPI_SPI>;
+                               dmas = <&gpi_dma2 0 2 QCOM_GPI_I2C>,
+                                      <&gpi_dma2 1 2 QCOM_GPI_I2C>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1091,8 +1091,8 @@
                                                <&aggre1_noc MASTER_QUP_2 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma2 0 2 QCOM_GPI_I2C>,
-                                      <&gpi_dma2 1 2 QCOM_GPI_I2C>;
+                               dmas = <&gpi_dma2 0 2 QCOM_GPI_SPI>,
+                                      <&gpi_dma2 1 2 QCOM_GPI_SPI>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1131,8 +1131,8 @@
                                                <&aggre1_noc MASTER_QUP_2 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma2 0 2 QCOM_GPI_SPI>,
-                                      <&gpi_dma2 1 2 QCOM_GPI_SPI>;
+                               dmas = <&gpi_dma2 0 3 QCOM_GPI_I2C>,
+                                      <&gpi_dma2 1 3 QCOM_GPI_I2C>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1153,8 +1153,8 @@
                                                <&aggre1_noc MASTER_QUP_2 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma2 0 3 QCOM_GPI_I2C>,
-                                      <&gpi_dma2 1 3 QCOM_GPI_I2C>;
+                               dmas = <&gpi_dma2 0 3 QCOM_GPI_SPI>,
+                                      <&gpi_dma2 1 3 QCOM_GPI_SPI>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1175,8 +1175,8 @@
                                                <&aggre1_noc MASTER_QUP_2 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma2 0 3 QCOM_GPI_SPI>,
-                                      <&gpi_dma2 1 3 QCOM_GPI_SPI>;
+                               dmas = <&gpi_dma2 0 4 QCOM_GPI_I2C>,
+                                      <&gpi_dma2 1 4 QCOM_GPI_I2C>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1197,8 +1197,8 @@
                                                <&aggre1_noc MASTER_QUP_2 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma2 0 4 QCOM_GPI_I2C>,
-                                      <&gpi_dma2 1 4 QCOM_GPI_I2C>;
+                               dmas = <&gpi_dma2 0 4 QCOM_GPI_SPI>,
+                                      <&gpi_dma2 1 4 QCOM_GPI_SPI>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1241,8 +1241,8 @@
                                                <&aggre1_noc MASTER_QUP_2 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma2 0 4 QCOM_GPI_SPI>,
-                                      <&gpi_dma2 1 4 QCOM_GPI_SPI>;
+                               dmas = <&gpi_dma2 0 5 QCOM_GPI_SPI>,
+                                      <&gpi_dma2 1 5 QCOM_GPI_SPI>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1285,8 +1285,8 @@
                                                <&aggre1_noc MASTER_QUP_2 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma2 0 5 QCOM_GPI_SPI>,
-                                      <&gpi_dma2 1 5 QCOM_GPI_SPI>;
+                               dmas = <&gpi_dma2 0 6 QCOM_GPI_SPI>,
+                                      <&gpi_dma2 1 6 QCOM_GPI_SPI>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1338,7 +1338,7 @@
                        };
                };
 
-               gpi_dma0: dma-controller@900000  {
+               gpi_dma0: dma-controller@900000 {
                        compatible = "qcom,sc8280xp-gpi-dma", "qcom,sm6350-gpi-dma";
                        reg = <0 0x00900000 0 0x60000>;
 
@@ -1393,8 +1393,8 @@
                                                <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma0 0 7 QCOM_GPI_I2C>,
-                                      <&gpi_dma0 1 7 QCOM_GPI_I2C>;
+                               dmas = <&gpi_dma0 0 0 QCOM_GPI_I2C>,
+                                      <&gpi_dma0 1 0 QCOM_GPI_I2C>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1415,8 +1415,8 @@
                                                <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma0 0 0 QCOM_GPI_I2C>,
-                                      <&gpi_dma0 1 0 QCOM_GPI_I2C>;
+                               dmas = <&gpi_dma0 0 0 QCOM_GPI_SPI>,
+                                      <&gpi_dma0 1 0 QCOM_GPI_SPI>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1437,8 +1437,8 @@
                                                <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma0 0 0 QCOM_GPI_SPI>,
-                                      <&gpi_dma0 1 0 QCOM_GPI_SPI>;
+                               dmas = <&gpi_dma0 0 1 QCOM_GPI_I2C>,
+                                      <&gpi_dma0 1 1 QCOM_GPI_I2C>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1459,8 +1459,8 @@
                                                <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma0 0 1 QCOM_GPI_I2C>,
-                                      <&gpi_dma0 1 1 QCOM_GPI_I2C>;
+                               dmas = <&gpi_dma0 0 1 QCOM_GPI_SPI>,
+                                      <&gpi_dma0 1 1 QCOM_GPI_SPI>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1481,8 +1481,8 @@
                                                <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma0 0 1 QCOM_GPI_SPI>,
-                                      <&gpi_dma0 1 1 QCOM_GPI_SPI>;
+                               dmas = <&gpi_dma0 0 2 QCOM_GPI_I2C>,
+                                      <&gpi_dma0 1 2 QCOM_GPI_I2C>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1503,8 +1503,8 @@
                                                <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma0 0 2 QCOM_GPI_I2C>,
-                                      <&gpi_dma0 1 2 QCOM_GPI_I2C>;
+                               dmas = <&gpi_dma0 0 2 QCOM_GPI_SPI>,
+                                      <&gpi_dma0 1 2 QCOM_GPI_SPI>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1539,8 +1539,8 @@
                                                <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma0 0 2 QCOM_GPI_SPI>,
-                                      <&gpi_dma0 1 2 QCOM_GPI_SPI>;
+                               dmas = <&gpi_dma0 0 3 QCOM_GPI_I2C>,
+                                      <&gpi_dma0 1 3 QCOM_GPI_I2C>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1561,8 +1561,8 @@
                                                <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma0 0 3 QCOM_GPI_I2C>,
-                                      <&gpi_dma0 1 3 QCOM_GPI_I2C>;
+                               dmas = <&gpi_dma0 0 3 QCOM_GPI_SPI>,
+                                      <&gpi_dma0 1 3 QCOM_GPI_SPI>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1583,8 +1583,8 @@
                                                <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma0 0 3 QCOM_GPI_SPI>,
-                                      <&gpi_dma0 1 3 QCOM_GPI_SPI>;
+                               dmas = <&gpi_dma0 0 4 QCOM_GPI_I2C>,
+                                      <&gpi_dma0 1 4 QCOM_GPI_I2C>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1605,8 +1605,8 @@
                                                <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma0 0 4 QCOM_GPI_I2C>,
-                                      <&gpi_dma0 1 4 QCOM_GPI_I2C>;
+                               dmas = <&gpi_dma0 0 4 QCOM_GPI_SPI>,
+                                      <&gpi_dma0 1 4 QCOM_GPI_SPI>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1627,8 +1627,8 @@
                                                <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma0 0 4 QCOM_GPI_SPI>,
-                                      <&gpi_dma0 1 4 QCOM_GPI_SPI>;
+                               dmas = <&gpi_dma0 0 5 QCOM_GPI_I2C>,
+                                      <&gpi_dma0 1 5 QCOM_GPI_I2C>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1649,8 +1649,8 @@
                                                <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma0 0 5 QCOM_GPI_I2C>,
-                                      <&gpi_dma0 1 5 QCOM_GPI_I2C>;
+                               dmas = <&gpi_dma0 0 5 QCOM_GPI_SPI>,
+                                      <&gpi_dma0 1 5 QCOM_GPI_SPI>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1671,8 +1671,8 @@
                                                <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma0 0 5 QCOM_GPI_SPI>,
-                                      <&gpi_dma0 1 5 QCOM_GPI_SPI>;
+                               dmas = <&gpi_dma0 0 6 QCOM_GPI_I2C>,
+                                      <&gpi_dma0 1 6 QCOM_GPI_I2C>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1693,8 +1693,8 @@
                                                <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma0 0 6 QCOM_GPI_I2C>,
-                                      <&gpi_dma0 1 6 QCOM_GPI_I2C>;
+                               dmas = <&gpi_dma0 0 6 QCOM_GPI_SPI>,
+                                      <&gpi_dma0 1 6 QCOM_GPI_SPI>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1715,8 +1715,8 @@
                                                <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma0 0 6 QCOM_GPI_SPI>,
-                                      <&gpi_dma0 1 6 QCOM_GPI_SPI>;
+                               dmas = <&gpi_dma0 0 7 QCOM_GPI_I2C>,
+                                      <&gpi_dma0 1 7 QCOM_GPI_I2C>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1800,8 +1800,8 @@
                                                <&aggre1_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma1 0 7 QCOM_GPI_I2C>,
-                                      <&gpi_dma1 1 7 QCOM_GPI_I2C>;
+                               dmas = <&gpi_dma1 0 0 QCOM_GPI_I2C>,
+                                      <&gpi_dma1 1 0 QCOM_GPI_I2C>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1822,8 +1822,8 @@
                                                <&aggre1_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma1 0 0 QCOM_GPI_I2C>,
-                                      <&gpi_dma1 1 0 QCOM_GPI_I2C>;
+                               dmas = <&gpi_dma1 0 0 QCOM_GPI_SPI>,
+                                      <&gpi_dma1 1 0 QCOM_GPI_SPI>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1844,8 +1844,8 @@
                                                <&aggre1_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma1 0 0 QCOM_GPI_SPI>,
-                                      <&gpi_dma1 1 0 QCOM_GPI_SPI>;
+                               dmas = <&gpi_dma1 0 1 QCOM_GPI_I2C>,
+                                      <&gpi_dma1 1 1 QCOM_GPI_I2C>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1866,8 +1866,8 @@
                                                <&aggre1_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma1 0 1 QCOM_GPI_I2C>,
-                                      <&gpi_dma1 1 1 QCOM_GPI_I2C>;
+                               dmas = <&gpi_dma1 0 1 QCOM_GPI_SPI>,
+                                      <&gpi_dma1 1 1 QCOM_GPI_SPI>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1888,8 +1888,8 @@
                                                <&aggre1_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma1 0 1 QCOM_GPI_SPI>,
-                                      <&gpi_dma1 1 1 QCOM_GPI_SPI>;
+                               dmas = <&gpi_dma1 0 2 QCOM_GPI_I2C>,
+                                      <&gpi_dma1 1 2 QCOM_GPI_I2C>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1910,8 +1910,8 @@
                                                <&aggre1_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma1 0 2 QCOM_GPI_I2C>,
-                                      <&gpi_dma1 1 2 QCOM_GPI_I2C>;
+                               dmas = <&gpi_dma1 0 2 QCOM_GPI_SPI>,
+                                      <&gpi_dma1 1 2 QCOM_GPI_SPI>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1932,8 +1932,8 @@
                                                <&aggre1_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma1 0 2 QCOM_GPI_SPI>,
-                                      <&gpi_dma1 1 2 QCOM_GPI_SPI>;
+                               dmas = <&gpi_dma1 0 3 QCOM_GPI_I2C>,
+                                      <&gpi_dma1 1 3 QCOM_GPI_I2C>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1954,8 +1954,8 @@
                                                <&aggre1_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma1 0 3 QCOM_GPI_I2C>,
-                                      <&gpi_dma1 1 3 QCOM_GPI_I2C>;
+                               dmas = <&gpi_dma1 0 3 QCOM_GPI_SPI>,
+                                      <&gpi_dma1 1 3 QCOM_GPI_SPI>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1976,8 +1976,8 @@
                                                <&aggre1_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma1 0 3 QCOM_GPI_SPI>,
-                                      <&gpi_dma1 1 3 QCOM_GPI_SPI>;
+                               dmas = <&gpi_dma1 0 4 QCOM_GPI_I2C>,
+                                      <&gpi_dma1 1 4 QCOM_GPI_I2C>;
                                dma-names = "tx",
                                            "rx";
 
@@ -1998,8 +1998,8 @@
                                                <&aggre1_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma1 0 4 QCOM_GPI_I2C>,
-                                      <&gpi_dma1 1 4 QCOM_GPI_I2C>;
+                               dmas = <&gpi_dma1 0 4 QCOM_GPI_SPI>,
+                                      <&gpi_dma1 1 4 QCOM_GPI_SPI>;
                                dma-names = "tx",
                                            "rx";
 
@@ -2020,8 +2020,8 @@
                                                <&aggre1_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma1 0 4 QCOM_GPI_SPI>,
-                                      <&gpi_dma1 1 4 QCOM_GPI_SPI>;
+                               dmas = <&gpi_dma1 0 5 QCOM_GPI_I2C>,
+                                      <&gpi_dma1 1 5 QCOM_GPI_I2C>;
                                dma-names = "tx",
                                            "rx";
 
@@ -2042,8 +2042,8 @@
                                                <&aggre1_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma1 0 5 QCOM_GPI_I2C>,
-                                      <&gpi_dma1 1 5 QCOM_GPI_I2C>;
+                               dmas = <&gpi_dma1 0 5 QCOM_GPI_SPI>,
+                                      <&gpi_dma1 1 5 QCOM_GPI_SPI>;
                                dma-names = "tx",
                                            "rx";
 
@@ -2064,8 +2064,8 @@
                                                <&aggre1_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma1 0 5 QCOM_GPI_SPI>,
-                                      <&gpi_dma1 1 5 QCOM_GPI_SPI>;
+                               dmas = <&gpi_dma1 0 6 QCOM_GPI_I2C>,
+                                      <&gpi_dma1 1 6 QCOM_GPI_I2C>;
                                dma-names = "tx",
                                            "rx";
 
@@ -2086,8 +2086,8 @@
                                                <&aggre1_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma1 0 6 QCOM_GPI_I2C>,
-                                      <&gpi_dma1 1 6 QCOM_GPI_I2C>;
+                               dmas = <&gpi_dma1 0 6 QCOM_GPI_SPI>,
+                                      <&gpi_dma1 1 6 QCOM_GPI_SPI>;
                                dma-names = "tx",
                                            "rx";
 
@@ -2108,8 +2108,8 @@
                                                <&aggre1_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config", "qup-memory";
 
-                               dmas = <&gpi_dma1 0 6 QCOM_GPI_SPI>,
-                                      <&gpi_dma1 1 6 QCOM_GPI_SPI>;
+                               dmas = <&gpi_dma1 0 7 QCOM_GPI_I2C>,
+                                      <&gpi_dma1 1 7 QCOM_GPI_I2C>;
                                dma-names = "tx",
                                            "rx";