Hi Geert, Thanks for your patch.
On 2018-03-08 15:10:05 +0100, Geert Uytterhoeven wrote: > On R-Car H3, on-chip peripheral modules that can make use of DMA are > wired to either SYS-DMAC0 only, or to both SYS-DMAC1 and SYS-DMAC2. > > Add the missing DMA properties pointing to SYS-DMAC2 for HSCIF[0-2], > SCIF[015], and I2C[0-2]. These were initially left out because early > firmware versions prohibited using SYS-DMAC2. This restriction has been > lifted in IPL and Secure Monitor Rev1.0.6 (released on Feb 25, 2016). > > Signed-off-by: Geert Uytterhoeven <[email protected]> Reviewed-by: Niklas Söderlund <[email protected]> > --- > arch/arm64/boot/dts/renesas/r8a7795.dtsi | 45 > +++++++++++++++++++------------- > 1 file changed, 27 insertions(+), 18 deletions(-) > > diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi > b/arch/arm64/boot/dts/renesas/r8a7795.dtsi > index 0648fe451d097f4e..849c2c7ff101c202 100644 > --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi > +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi > @@ -1076,8 +1076,9 @@ > <&cpg CPG_CORE R8A7795_CLK_S3D1>, > <&scif_clk>; > clock-names = "fck", "brg_int", "scif_clk"; > - dmas = <&dmac1 0x31>, <&dmac1 0x30>; > - dma-names = "tx", "rx"; > + dmas = <&dmac1 0x31>, <&dmac1 0x30>, > + <&dmac2 0x31>, <&dmac2 0x30>; > + dma-names = "tx", "rx", "tx", "rx"; > power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; > resets = <&cpg 520>; > status = "disabled"; > @@ -1093,8 +1094,9 @@ > <&cpg CPG_CORE R8A7795_CLK_S3D1>, > <&scif_clk>; > clock-names = "fck", "brg_int", "scif_clk"; > - dmas = <&dmac1 0x33>, <&dmac1 0x32>; > - dma-names = "tx", "rx"; > + dmas = <&dmac1 0x33>, <&dmac1 0x32>, > + <&dmac2 0x33>, <&dmac2 0x32>; > + dma-names = "tx", "rx", "tx", "rx"; > power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; > resets = <&cpg 519>; > status = "disabled"; > @@ -1110,8 +1112,9 @@ > <&cpg CPG_CORE R8A7795_CLK_S3D1>, > <&scif_clk>; > clock-names = "fck", "brg_int", "scif_clk"; > - dmas = <&dmac1 0x35>, <&dmac1 0x34>; > - dma-names = "tx", "rx"; > + dmas = <&dmac1 0x35>, <&dmac1 0x34>, > + <&dmac2 0x35>, <&dmac2 0x34>; > + dma-names = "tx", "rx", "tx", "rx"; > power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; > resets = <&cpg 518>; > status = "disabled"; > @@ -1222,8 +1225,9 @@ > <&cpg CPG_CORE R8A7795_CLK_S3D1>, > <&scif_clk>; > clock-names = "fck", "brg_int", "scif_clk"; > - dmas = <&dmac1 0x51>, <&dmac1 0x50>; > - dma-names = "tx", "rx"; > + dmas = <&dmac1 0x51>, <&dmac1 0x50>, > + <&dmac2 0x51>, <&dmac2 0x50>; > + dma-names = "tx", "rx", "tx", "rx"; > power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; > resets = <&cpg 207>; > status = "disabled"; > @@ -1238,8 +1242,9 @@ > <&cpg CPG_CORE R8A7795_CLK_S3D1>, > <&scif_clk>; > clock-names = "fck", "brg_int", "scif_clk"; > - dmas = <&dmac1 0x53>, <&dmac1 0x52>; > - dma-names = "tx", "rx"; > + dmas = <&dmac1 0x53>, <&dmac1 0x52>, > + <&dmac2 0x53>, <&dmac2 0x52>; > + dma-names = "tx", "rx", "tx", "rx"; > power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; > resets = <&cpg 206>; > status = "disabled"; > @@ -1302,8 +1307,9 @@ > <&cpg CPG_CORE R8A7795_CLK_S3D1>, > <&scif_clk>; > clock-names = "fck", "brg_int", "scif_clk"; > - dmas = <&dmac1 0x5b>, <&dmac1 0x5a>; > - dma-names = "tx", "rx"; > + dmas = <&dmac1 0x5b>, <&dmac1 0x5a>, > + <&dmac2 0x5b>, <&dmac2 0x5a>; > + dma-names = "tx", "rx", "tx", "rx"; > power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; > resets = <&cpg 202>; > status = "disabled"; > @@ -1335,8 +1341,9 @@ > clocks = <&cpg CPG_MOD 931>; > power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; > resets = <&cpg 931>; > - dmas = <&dmac1 0x91>, <&dmac1 0x90>; > - dma-names = "tx", "rx"; > + dmas = <&dmac1 0x91>, <&dmac1 0x90>, > + <&dmac2 0x91>, <&dmac2 0x90>; > + dma-names = "tx", "rx", "tx", "rx"; > i2c-scl-internal-delay-ns = <110>; > status = "disabled"; > }; > @@ -1351,8 +1358,9 @@ > clocks = <&cpg CPG_MOD 930>; > power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; > resets = <&cpg 930>; > - dmas = <&dmac1 0x93>, <&dmac1 0x92>; > - dma-names = "tx", "rx"; > + dmas = <&dmac1 0x93>, <&dmac1 0x92>, > + <&dmac2 0x93>, <&dmac2 0x92>; > + dma-names = "tx", "rx", "tx", "rx"; > i2c-scl-internal-delay-ns = <6>; > status = "disabled"; > }; > @@ -1367,8 +1375,9 @@ > clocks = <&cpg CPG_MOD 929>; > power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; > resets = <&cpg 929>; > - dmas = <&dmac1 0x95>, <&dmac1 0x94>; > - dma-names = "tx", "rx"; > + dmas = <&dmac1 0x95>, <&dmac1 0x94>, > + <&dmac2 0x95>, <&dmac2 0x94>; > + dma-names = "tx", "rx", "tx", "rx"; > i2c-scl-internal-delay-ns = <6>; > status = "disabled"; > }; > -- > 2.7.4 > -- Regards, Niklas Söderlund
