[PATCH v2 0/5] arm64: dts: renesas: Enable DMA for SCIF2 where missing

[PATCH v2 0/5] arm64: dts: renesas: Enable DMA for SCIF2 where missing

[Geert Uytterhoeven]

	Hi Simon, Magnus,

R-Car Gen3 Hardware User Manual Rev. 1.50 (finally) documents DMA
support for the SCIF2 serial port on R-Car H3, M3-W, M3-N, E3, and D3
(albeit with the wrong MID/RID, due to a hex-vs-dec mix-up).

This patch series enables DMA for the SCIF2 serial ports on R-Car Gen3
and RZ/G2 SoCs that do not have DMA enabled yet.  It consists of 5
separate patches, one for each SoC, to ease backporting.

Changes compared to v1:
  - Add Fixes tags where appropriate.

This has been tested on R-Car M3-W, M3-N, and E3.

Thanks!

Geert Uytterhoeven (5):
  arm64: dts: renesas: r8a774a1: Enable DMA for SCIF2
  arm64: dts: renesas: r8a774c0: Enable DMA for SCIF2
  arm64: dts: renesas: r8a7796: Enable DMA for SCIF2
  arm64: dts: renesas: r8a77965: Enable DMA for SCIF2
  arm64: dts: renesas: r8a77990: Enable DMA for SCIF2

 arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 3 +++
 arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 3 +++
 arch/arm64/boot/dts/renesas/r8a7796.dtsi  | 3 +++
 arch/arm64/boot/dts/renesas/r8a77965.dtsi | 3 +++
 arch/arm64/boot/dts/renesas/r8a77990.dtsi | 4 +++-
 5 files changed, 15 insertions(+), 1 deletion(-)

-- 
2.17.1

[PATCH v2 1/5] arm64: dts: renesas: r8a774a1: Enable DMA for SCIF2

[Geert Uytterhoeven]

SCIF2 on RZ/G2M can be used with both DMAC1 and DMAC2.

Fixes: 3a3933a4fa36430a ("arm64: dts: renesas: r8a774a1: Add SCIF and HSCIF nodes")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - Add Fixes tag.
---
 arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
index 46a8fd20108fbd3a..5cfc9cd6bb2bea8d 100644
--- a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
@@ -1011,6 +1011,9 @@
 				 <&cpg CPG_CORE R8A774A1_CLK_S3D1>,
 				 <&scif_clk>;
 			clock-names = "fck", "brg_int", "scif_clk";
+			dmas = <&dmac1 0x13>, <&dmac1 0x12>,
+			       <&dmac2 0x13>, <&dmac2 0x12>;
+			dma-names = "tx", "rx", "tx", "rx";
 			power-domains = <&sysc R8A774A1_PD_ALWAYS_ON>;
 			resets = <&cpg 310>;
 			status = "disabled";
-- 
2.17.1

[PATCH v2 2/5] arm64: dts: renesas: r8a774c0: Enable DMA for SCIF2

[Geert Uytterhoeven]

SCIF2 on RZ/G2E can be used with both DMAC1 and DMAC2.

Fixes: 1b24f9e8ea3ff95f ("arm64: dts: renesas: r8a774c0: Add SCIF and HSCIF nodes")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - Add Fixes tag.
---
 arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/r8a774c0.dtsi b/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
index 3970aafeee1236c0..f2e390f7f1d5b157 100644
--- a/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
@@ -941,6 +941,9 @@
 				 <&cpg CPG_CORE R8A774C0_CLK_S3D1C>,
 				 <&scif_clk>;
 			clock-names = "fck", "brg_int", "scif_clk";
+			dmas = <&dmac1 0x13>, <&dmac1 0x12>,
+			       <&dmac2 0x13>, <&dmac2 0x12>;
+			dma-names = "tx", "rx", "tx", "rx";
 			power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
 			resets = <&cpg 310>;
 			status = "disabled";
-- 
2.17.1

[PATCH v2 3/5] arm64: dts: renesas: r8a7796: Enable DMA for SCIF2

[Geert Uytterhoeven]

SCIF2 on R-Car M3-W can be used with both DMAC1 and DMAC2.

Fixes: dbcae5ea4bd27409 ("arm64: dts: r8a7796: Enable SCIF DMA")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - Add Fixes tag.
---
 arch/arm64/boot/dts/renesas/r8a7796.dtsi | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index 3a9f8c7081ca0366..28a4803f0e489723 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -1262,6 +1262,9 @@
 				 <&cpg CPG_CORE R8A7796_CLK_S3D1>,
 				 <&scif_clk>;
 			clock-names = "fck", "brg_int", "scif_clk";
+			dmas = <&dmac1 0x13>, <&dmac1 0x12>,
+			       <&dmac2 0x13>, <&dmac2 0x12>;
+			dma-names = "tx", "rx", "tx", "rx";
 			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
 			resets = <&cpg 310>;
 			status = "disabled";
-- 
2.17.1

[PATCH v2 4/5] arm64: dts: renesas: r8a77965: Enable DMA for SCIF2

[Geert Uytterhoeven]

SCIF2 on R-Car M3-N can be used with both DMAC1 and DMAC2.

Fixes: 0ea5b2fd38db56aa ("arm64: dts: renesas: r8a77965: Add SCIF device nodes")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - Add Fixes tag.
---
 arch/arm64/boot/dts/renesas/r8a77965.dtsi | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/r8a77965.dtsi b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
index 6dc9b1fef8303774..4b3730f640efa78b 100644
--- a/arch/arm64/boot/dts/renesas/r8a77965.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
@@ -1068,6 +1068,9 @@
 				 <&cpg CPG_CORE R8A77965_CLK_S3D1>,
 				 <&scif_clk>;
 			clock-names = "fck", "brg_int", "scif_clk";
+			dmas = <&dmac1 0x13>, <&dmac1 0x12>,
+			       <&dmac2 0x13>, <&dmac2 0x12>;
+			dma-names = "tx", "rx", "tx", "rx";
 			power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
 			resets = <&cpg 310>;
 			status = "disabled";
-- 
2.17.1

[PATCH v2 5/5] arm64: dts: renesas: r8a77990: Enable DMA for SCIF2

[Geert Uytterhoeven]

SCIF2 on R-Car E3 can be used with both DMAC1 and DMAC2.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - No changes.
---
 arch/arm64/boot/dts/renesas/r8a77990.dtsi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/renesas/r8a77990.dtsi b/arch/arm64/boot/dts/renesas/r8a77990.dtsi
index 84bbe70cb0abfc88..786178cf1ffd1304 100644
--- a/arch/arm64/boot/dts/renesas/r8a77990.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77990.dtsi
@@ -993,7 +993,9 @@
 				 <&cpg CPG_CORE R8A77990_CLK_S3D1C>,
 				 <&scif_clk>;
 			clock-names = "fck", "brg_int", "scif_clk";
-
+			dmas = <&dmac1 0x13>, <&dmac1 0x12>,
+			       <&dmac2 0x13>, <&dmac2 0x12>;
+			dma-names = "tx", "rx", "tx", "rx";
 			power-domains = <&sysc R8A77990_PD_ALWAYS_ON>;
 			resets = <&cpg 310>;
 			status = "disabled";
-- 
2.17.1

Re: [PATCH v2 0/5] arm64: dts: renesas: Enable DMA for SCIF2 where missing

[Simon Horman]

On Thu, Jan 10, 2019 at 02:39:12PM +0100, Geert Uytterhoeven wrote:
> 	Hi Simon, Magnus,
> 
> R-Car Gen3 Hardware User Manual Rev. 1.50 (finally) documents DMA
> support for the SCIF2 serial port on R-Car H3, M3-W, M3-N, E3, and D3
> (albeit with the wrong MID/RID, due to a hex-vs-dec mix-up).
> 
> This patch series enables DMA for the SCIF2 serial ports on R-Car Gen3
> and RZ/G2 SoCs that do not have DMA enabled yet.  It consists of 5
> separate patches, one for each SoC, to ease backporting.
> 
> Changes compared to v1:
>   - Add Fixes tags where appropriate.
> 
> This has been tested on R-Car M3-W, M3-N, and E3.
> 
> Thanks!
> 
> Geert Uytterhoeven (5):
>   arm64: dts: renesas: r8a774a1: Enable DMA for SCIF2
>   arm64: dts: renesas: r8a774c0: Enable DMA for SCIF2
>   arm64: dts: renesas: r8a7796: Enable DMA for SCIF2
>   arm64: dts: renesas: r8a77965: Enable DMA for SCIF2
>   arm64: dts: renesas: r8a77990: Enable DMA for SCIF2

Thanks, I have applied the r8a77965, r8a7796 and r8a774a1 patches
as fixes for v5.0 and the other patches for v5.1.

> 
>  arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 3 +++
>  arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 3 +++
>  arch/arm64/boot/dts/renesas/r8a7796.dtsi  | 3 +++
>  arch/arm64/boot/dts/renesas/r8a77965.dtsi | 3 +++
>  arch/arm64/boot/dts/renesas/r8a77990.dtsi | 4 +++-
>  5 files changed, 15 insertions(+), 1 deletion(-)
> 
> -- 
> 2.17.1
>