Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1229c729 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-fixes2-for-v5.0' of... 

Merge tag 'renesas-fixes2-for-v5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into arm/fixes

Second Round of Renesas ARM Based SoC Fixes for v5.0

Enable DMA for SCIF2 on R-Car M3-W (r8a7796) and M3-n (r8a77965), and
(RZ/G2M) r8a774a1 SoCs.

This is was omitted from patches enabling DMA for other SCIF devices on the
same SoCs due to missing documentation.  However, it is regarded as a fix
as arguably those patches claim to add this feature.

Per-SoC patches are provided to ease backporting of this fix as the kernel
version to be fixed is different for each SoC.

* tag 'renesas-fixes2-for-v5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  arm64: dts: renesas: r8a77965: Enable DMA for SCIF2
  arm64: dts: renesas: r8a7796: Enable DMA for SCIF2
  arm64: dts: renesas: r8a774a1: Enable DMA for SCIF2

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 03937704 05c8478a

arch/arm64/boot/dts/renesas/r8a774a1.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -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";

arch/arm64/boot/dts/renesas/r8a7796.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -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";

arch/arm64/boot/dts/renesas/r8a77965.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -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";