[PATCH 6.18 123/614] arm64: dts: qcom: sc8280xp: Fix shifted GPI DMA channels

16 Dec 2025

6.18-stable review patch.  If anyone has any objections, please let me know.
------------------
From: Pengyu Luo mitltlatltl@gmail.com
[ Upstream commit fb48d3f3abba9a7bca2814fa2e9db8ac5b9e16b9 ]
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
Signed-off-by: Sasha Levin sashal@kernel.org
---
 arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 170 ++++++++++++-------------
 1 file changed, 85 insertions(+), 85 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
index 279e5e6beae20..963ce2362a52e 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
@@ -967,8 +967,8 @@ i2c16: i2c@880000 {
    			                <&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 @@ spi16: spi@880000 {
    			                <&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 @@ i2c17: i2c@884000 {
    			                <&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 @@ spi17: spi@884000 {
    			                <&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 @@ i2c18: i2c@888000 {
    			                <&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 @@ spi18: spi@888000 {
    			                <&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 @@ i2c19: i2c@88c000 {
    			                <&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 @@ spi19: spi@88c000 {
    			                <&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 @@ i2c20: i2c@890000 {
    			                <&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 @@ spi20: spi@890000 {
    			                <&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 @@ spi21: spi@894000 {
    			                <&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 @@ spi22: spi@898000 {
    			                <&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 @@ spi23: spi@89c000 {
    		};
    	};
-		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 @@ i2c0: i2c@980000 {
    					<&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 @@ spi0: spi@980000 {
    					<&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 @@ i2c1: i2c@984000 {
    					<&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 @@ spi1: spi@984000 {
    					<&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 @@ i2c2: i2c@988000 {
    					<&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 @@ spi2: spi@988000 {
    					<&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 @@ i2c3: i2c@98c000 {
    					<&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 @@ spi3: spi@98c000 {
    					<&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 @@ i2c4: i2c@990000 {
    					<&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 @@ spi4: spi@990000 {
    					<&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 @@ i2c5: i2c@994000 {
    					<&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 @@ spi5: spi@994000 {
    					<&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 @@ i2c6: i2c@998000 {
    					<&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 @@ spi6: spi@998000 {
    					<&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 @@ i2c7: i2c@99c000 {
    					<&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 @@ i2c8: i2c@a80000 {
    			                <&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 @@ spi8: spi@a80000 {
    			                <&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 @@ i2c9: i2c@a84000 {
    			                <&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 @@ spi9: spi@a84000 {
    			                <&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 @@ i2c10: i2c@a88000 {
    			                <&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 @@ spi10: spi@a88000 {
    			                <&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 @@ i2c11: i2c@a8c000 {
    			                <&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 @@ spi11: spi@a8c000 {
    			                <&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 @@ i2c12: i2c@a90000 {
    			                <&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 @@ spi12: spi@a90000 {
    			                <&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 @@ i2c13: i2c@a94000 {
    			                <&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 @@ spi13: spi@a94000 {
    			                <&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 @@ i2c14: i2c@a98000 {
    			                <&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 @@ spi14: spi@a98000 {
    			                <&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 @@ i2c15: i2c@a9c000 {
    			                <&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";
-- 
2.51.0





    

2025

2024

2023

2022

2021

2020

2019

2018

2017

[PATCH 6.18 123/614] arm64: dts: qcom: sc8280xp: Fix shifted GPI DMA channels