Skip to contentSkip to conversation

ARM: dts: Modify SPI nodes according generic DMA DT bindings

PATCH Superseded Padmavathi Venna 4 participants 4 messages Mar 5, 2013

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: dts: Modify SPI nodes according generic DMA DT bindings

This patch removes custom way of adding spi dma channels and adds according to new generic DMA DT bindings on samsung exynos4 and exynos5440 platforms.

---
 arch/arm/boot/dts/exynos4.dtsi    |   15 +++++++++------
 arch/arm/boot/dts/exynos5440.dtsi |    5 +++--
 2 files changed, 12 insertions(+), 8 deletions(-)
arch/arm/boot/dts/exynos4.dtsi +9 -6
index 1a62bcf..2449651 100644
@@ -235,8 +235,9 @@
 		compatible = "samsung,exynos4210-spi";
 		reg = <0x13920000 0x100>;
 		interrupts = <0 66 0>;
-		tx-dma-channel = <&pdma0 7>; /* preliminary */
-		rx-dma-channel = <&pdma0 6>; /* preliminary */
+		dmas = <&pdma0 7
+			&pdma0 6>;
+		dma-names = "tx", "rx";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		status = "disabled";
@@ -246,8 +247,9 @@
 		compatible = "samsung,exynos4210-spi";
 		reg = <0x13930000 0x100>;
 		interrupts = <0 67 0>;
-		tx-dma-channel = <&pdma1 7>; /* preliminary */
-		rx-dma-channel = <&pdma1 6>; /* preliminary */
+		dmas = <&pdma0 7
+			&pdma0 6>;
+		dma-names = "tx", "rx";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		status = "disabled";
@@ -257,8 +259,9 @@
 		compatible = "samsung,exynos4210-spi";
 		reg = <0x13940000 0x100>;
 		interrupts = <0 68 0>;
-		tx-dma-channel = <&pdma0 9>; /* preliminary */
-		rx-dma-channel = <&pdma0 8>; /* preliminary */
+		dmas = <&pdma0 9
+			&pdma0 8>;
+		dma-names = "tx", "rx";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		status = "disabled";
arch/arm/boot/dts/exynos5440.dtsi +3 -2
index 9a99755..31a3626 100644
@@ -79,8 +79,9 @@
 		compatible = "samsung,exynos4210-spi";
 		reg = <0xD0000 0x1000>;
 		interrupts = <0 4 0>;
-		tx-dma-channel = <&pdma0 5>; /* preliminary */
-		rx-dma-channel = <&pdma0 4>; /* preliminary */
+		dmas = <&pdma0 5
+			&pdma0 4>;
+		dma-names = "tx", "rx";
 		#address-cells = <1>;
 		#size-cells = <0>;
 	};
Signature · 1 line
1.7.4.4
#1 lore raw

PATCH 1/1 ARM: dts: Modify SPI nodes according generic DMA DT bindings

Quoted 27 lines · Padmavathi Venna

This patch removes custom way of adding spi dma channels and adds according to new generic DMA DT bindings on samsung exynos4 and exynos5440 platforms.

---
 arch/arm/boot/dts/exynos4.dtsi    |   15 +++++++++------
 arch/arm/boot/dts/exynos5440.dtsi |    5 +++--
 2 files changed, 12 insertions(+), 8 deletions(-)
arch/arm/boot/dts/exynos4.dtsi +3 -2
index 1a62bcf..2449651 100644
@@ -235,8 +235,9 @@
                compatible = "samsung,exynos4210-spi";
                reg = <0x13920000 0x100>;
                interrupts = <0 66 0>;
-               tx-dma-channel = <&pdma0 7>; /* preliminary */
-               rx-dma-channel = <&pdma0 6>; /* preliminary */
+               dmas = <&pdma0 7
+                       &pdma0 6>;
+               dma-names = "tx", "rx";
                #address-cells = <1>;
                #size-cells = <0>;
                status = "disabled";

arch/arm/boot/dts/exynos4.dtsi line 251

Quoted 7 lines
arch/arm/boot/dts/exynos4.dtsi +2 -2
@@ -246,8 +247,9 @@
                compatible = "samsung,exynos4210-spi";
                reg = <0x13930000 0x100>;
                interrupts = <0 67 0>;
-               tx-dma-channel = <&pdma1 7>; /* preliminary */
-               rx-dma-channel = <&pdma1 6>; /* preliminary */
+               dmas = <&pdma0 7
+                       &pdma0 6>;

Shouldn't these be pdma1 as was earlier?

#2 lore raw

PATCH 1/1 ARM: dts: Modify SPI nodes according generic DMA DT bindings

Quoted 29 lines · Sachin Kamat
Quoted 28 lines · Padmavathi Venna

This patch removes custom way of adding spi dma channels and adds according to new generic DMA DT bindings on samsung exynos4 and exynos5440 platforms.

---
 arch/arm/boot/dts/exynos4.dtsi    |   15 +++++++++------
 arch/arm/boot/dts/exynos5440.dtsi |    5 +++--
 2 files changed, 12 insertions(+), 8 deletions(-)
arch/arm/boot/dts/exynos4.dtsi +3 -2
index 1a62bcf..2449651 100644
@@ -235,8 +235,9 @@
                compatible = "samsung,exynos4210-spi";
                reg = <0x13920000 0x100>;
                interrupts = <0 66 0>;
-               tx-dma-channel = <&pdma0 7>; /* preliminary */
-               rx-dma-channel = <&pdma0 6>; /* preliminary */
+               dmas = <&pdma0 7
+                       &pdma0 6>;
+               dma-names = "tx", "rx";
                #address-cells = <1>;
                #size-cells = <0>;
                status = "disabled";
@@ -246,8 +247,9 @@
                compatible = "samsung,exynos4210-spi";
Quoted 8 lines

arch/arm/boot/dts/exynos4.dtsi line 251

Quoted 6 lines
arch/arm/boot/dts/exynos4.dtsi +2 -2
                reg = <0x13930000 0x100>;
                interrupts = <0 67 0>;
-               tx-dma-channel = <&pdma1 7>; /* preliminary */
-               rx-dma-channel = <&pdma1 6>; /* preliminary */
+               dmas = <&pdma0 7
+                       &pdma0 6>;

Shouldn't these be pdma1 as was earlier?

Oops, It's my mistake. Will repost this.

Thanks
Padma

#3 lore raw

PATCH 1/1 ARM: dts: Modify SPI nodes according generic DMA DT bindings

In reply to Sachin Kamat
Quoted 12 lines · Sachin Kamat
Quoted 11 lines · Padmavathi Venna

This patch removes custom way of adding spi dma channels and adds according to new generic DMA DT bindings on samsung exynos4 and exynos5440 platforms.

---
 arch/arm/boot/dts/exynos4.dtsi    |   15 +++++++++------
 arch/arm/boot/dts/exynos5440.dtsi |    5 +++--
 2 files changed, 12 insertions(+), 8 deletions(-)
arch/arm/boot/dts/exynos4.dtsi +0 -0

...

Quoted 10 lines

arch/arm/boot/dts/exynos4.dtsi line 251

Quoted 8 lines
arch/arm/boot/dts/exynos4.dtsi +2 -2
@@ -246,8 +247,9 @@
                compatible = "samsung,exynos4210-spi";
                reg = <0x13930000 0x100>;
                interrupts = <0 67 0>;
-               tx-dma-channel = <&pdma1 7>; /* preliminary */
-               rx-dma-channel = <&pdma1 6>; /* preliminary */
+               dmas = <&pdma0 7
+                       &pdma0 6>;

Shouldn't these be pdma1 as was earlier?

Yes, it should. And this is also what the SoC documentation says - SPI1 is assigned to Peri DMA1.