Skip to contentSkip to conversation

arm64: dts: r8a7796: Add missing second pair of DMA names to MSIOF nodes

PATCH New Geert Uytterhoeven 3 participants 4 messages Jul 12, 2017 – Jul 13, 2017

Subsystems (2)
lore
Share & tools
lore

Geert Uytterhoeven

author maintainer
#0 lore raw

PATCH 1/1 arm64: dts: r8a7796: Add missing second pair of DMA names to MSIOF nodes

MSIOF0 and MSIOF1 are tied to two DMA controllers through two pairs of DMA specifiers. However, the second pair of corresponding DMA names was missing.

Fixes 80fab06e258da762 ("arm64: dts: r8a7796: Add all MSIOF nodes")
---
 arch/arm64/boot/dts/renesas/r8a7796.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/renesas/r8a7796.dtsi +2 -2
index c7bbb501ebe06826..f63f9107f453b5b7 100644
@@ -1000,7 +1000,7 @@
 			clocks = <&cpg CPG_MOD 211>;
 			dmas = <&dmac1 0x41>, <&dmac1 0x40>,
 			       <&dmac2 0x41>, <&dmac2 0x40>;
-			dma-names = "tx", "rx";
+			dma-names = "tx", "rx", "tx", "rx";
 			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
 			resets = <&cpg 211>;
 			#address-cells = <1>;
@@ -1016,7 +1016,7 @@
 			clocks = <&cpg CPG_MOD 210>;
 			dmas = <&dmac1 0x43>, <&dmac1 0x42>,
 			       <&dmac2 0x43>, <&dmac2 0x42>;
-			dma-names = "tx", "rx";
+			dma-names = "tx", "rx", "tx", "rx";
 			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
 			resets = <&cpg 210>;
 			#address-cells = <1>;
Signature · 1 line
2.7.4
Applied
#1 lore raw

PATCH 1/1 arm64: dts: r8a7796: Add missing second pair of DMA names to MSIOF nodes

Quoted 9 lines · Geert Uytterhoeven

MSIOF0 and MSIOF1 are tied to two DMA controllers through two pairs of DMA specifiers. However, the second pair of corresponding DMA names was missing.

Fixes 80fab06e258da762 ("arm64: dts: r8a7796: Add all MSIOF nodes")
---
 arch/arm64/boot/dts/renesas/r8a7796.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Thanks, applied for v4.14.

Let me know if you would prefer it handled as a fix for v4.13. I see the commit it fixes was part of v4.11.

#2 lore raw

PATCH 1/1 arm64: dts: r8a7796: Add missing second pair of DMA names to MSIOF nodes

Hi Simon,

Quoted 11 lines · Simon Horman
Quoted 9 lines · Geert Uytterhoeven

MSIOF0 and MSIOF1 are tied to two DMA controllers through two pairs of DMA specifiers. However, the second pair of corresponding DMA names was missing.

Fixes 80fab06e258da762 ("arm64: dts: r8a7796: Add all MSIOF nodes")
---
 arch/arm64/boot/dts/renesas/r8a7796.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 4 lines

Thanks, applied for v4.14.

Let me know if you would prefer it handled as a fix for v4.13. I see the commit it fixes was part of v4.11.

Thanks!

V4.14 is fine. It's not enabled in any board DTS, and DMA will stll work as long as there are free channels on DMAC1.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#3 lore raw

PATCH 1/1 arm64: dts: r8a7796: Add missing second pair of DMA names to MSIOF nodes

Quoted 16 lines · Geert Uytterhoeven

Hi Simon,

Quoted 13 lines · Simon Horman
Quoted 9 lines · Geert Uytterhoeven

MSIOF0 and MSIOF1 are tied to two DMA controllers through two pairs of DMA specifiers. However, the second pair of corresponding DMA names was missing.

Fixes 80fab06e258da762 ("arm64: dts: r8a7796: Add all MSIOF nodes")
---
 arch/arm64/boot/dts/renesas/r8a7796.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Thanks, applied for v4.14.

Quoted 7 lines
Quoted 2 lines

Let me know if you would prefer it handled as a fix for v4.13. I see the commit it fixes was part of v4.11.

Thanks!

V4.14 is fine. It's not enabled in any board DTS, and DMA will stll work as long as there are free channels on DMAC1.

Thanks, for clarifying. The second point above was the main part of my reasoning that it is v4.14 material.