Re: [PATCH] arm64: dts: renesas: r8a7795: Add missing SYS-DMAC2 dmas

[Simon Horman]

On Tue, Mar 13, 2018 at 08:23:40PM +0100, Geert Uytterhoeven wrote:
> Hi Simon,
> 
> On Tue, Mar 13, 2018 at 7:43 PM, Simon Horman  wrote:
> > On Thu, Mar 08, 2018 at 03:10:05PM +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 
> >
> > Thanks, applied.
> 
> This one, or v2?

v2

Re: [PATCH] arm64: dts: renesas: r8a7795: Add missing SYS-DMAC2 dmas

[Geert Uytterhoeven]

Hi Simon,

On Tue, Mar 13, 2018 at 7:43 PM, Simon Horman  wrote:
> On Thu, Mar 08, 2018 at 03:10:05PM +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 
>
> Thanks, applied.

This one, or v2?

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@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

Re: [PATCH] arm64: dts: renesas: r8a7795: Add missing SYS-DMAC2 dmas

[Simon Horman]

On Thu, Mar 08, 2018 at 03:10:05PM +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 

Thanks, applied.

Re: [PATCH] arm64: dts: renesas: r8a7795: Add missing SYS-DMAC2 dmas

[Niklas Söderlund]

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 

Reviewed-by: Niklas Söderlund 

> ---
>  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_CORE R8A7795_CLK_S3D1>,
><_clk>;
>   clock-names = "fck", "brg_int", "scif_clk";
> - dmas = < 0x31>, < 0x30>;
> - dma-names = "tx", "rx";
> + dmas = < 0x31>, < 0x30>,
> +< 0x31>, < 0x30>;
> + dma-names = "tx", "rx", "tx", "rx";
>   power-domains = < R8A7795_PD_ALWAYS_ON>;
>   resets = < 520>;
>   status = "disabled";
> @@ -1093,8 +1094,9 @@
>< CPG_CORE R8A7795_CLK_S3D1>,
><_clk>;
>   clock-names = "fck", "brg_int", "scif_clk";
> - dmas = < 0x33>, < 0x32>;
> - dma-names = "tx", "rx";
> + dmas = < 0x33>, < 0x32>,
> +< 0x33>, < 0x32>;
> + dma-names = "tx", "rx", "tx", "rx";
>   power-domains = < R8A7795_PD_ALWAYS_ON>;
>   resets = < 519>;
>   status = "disabled";
> @@ -1110,8 +1112,9 @@
>< CPG_CORE R8A7795_CLK_S3D1>,
><_clk>;
>   clock-names = "fck", "brg_int", "scif_clk";
> - dmas = < 0x35>, < 0x34>;
> - dma-names = "tx", "rx";
> + dmas = < 0x35>, < 0x34>,
> +< 0x35>, < 0x34>;
> + dma-names = "tx", "rx", "tx", "rx";
>   power-domains = < R8A7795_PD_ALWAYS_ON>;
>   resets = < 518>;
>   status = "disabled";
> @@ -1222,8 +1225,9 @@
>< CPG_CORE R8A7795_CLK_S3D1>,
><_clk>;
>   clock-names = "fck", "brg_int", "scif_clk";
> - dmas = < 0x51>, < 0x50>;
> - dma-names = "tx", "rx";
> + dmas = < 0x51>, < 0x50>,
> +< 0x51>, < 0x50>;
> + dma-names = "tx", "rx", "tx", "rx";
>   power-domains = < R8A7795_PD_ALWAYS_ON>;
>   resets = < 207>;
>   status = "disabled";
> @@ -1238,8 +1242,9 @@
>< CPG_CORE R8A7795_CLK_S3D1>,
><_clk>;
>   clock-names = "fck", "brg_int", "scif_clk";
> - dmas = < 0x53>, < 0x52>;
> - dma-names = "tx", "rx";
> + dmas = < 0x53>, < 0x52>,
> +< 0x53>, < 0x52>;
> + dma-names = "tx", "rx", "tx", "rx";
>   power-domains = < R8A7795_PD_ALWAYS_ON>;
>   resets = < 206>;
>   status = "disabled";
> @@ -1302,8 +1307,9 @@
>< CPG_CORE R8A7795_CLK_S3D1>,
><_clk>;
>   clock-names = "fck", "brg_int", "scif_clk";
> - dmas = < 0x5b>, < 0x5a>;
> - dma-names = "tx", "rx";
> + dmas = < 0x5b>, < 0x5a>,
> +< 0x5b>, < 0x5a>;
> + dma-names = "tx", "rx", "tx", "rx";
>   power-domains = < R8A7795_PD_ALWAYS_ON>;
>   resets = < 202>;
>   status = "disabled";
> @@ -1335,8 +1341,9 @@
>   clocks = < CPG_MOD 931>;
>   power-domains = < R8A7795_PD_ALWAYS_ON>;
>   resets = < 931>;
> - dmas = < 0x91>, < 0x90>;
> - dma-names = "tx", "rx";
> + dmas = < 0x91>, < 0x90>,
> 

[PATCH] arm64: dts: renesas: r8a7795: Add missing SYS-DMAC2 dmas

[Geert Uytterhoeven]

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 
---
 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_CORE R8A7795_CLK_S3D1>,
 <_clk>;
clock-names = "fck", "brg_int", "scif_clk";
-   dmas = < 0x31>, < 0x30>;
-   dma-names = "tx", "rx";
+   dmas = < 0x31>, < 0x30>,
+  < 0x31>, < 0x30>;
+   dma-names = "tx", "rx", "tx", "rx";
power-domains = < R8A7795_PD_ALWAYS_ON>;
resets = < 520>;
status = "disabled";
@@ -1093,8 +1094,9 @@
 < CPG_CORE R8A7795_CLK_S3D1>,
 <_clk>;
clock-names = "fck", "brg_int", "scif_clk";
-   dmas = < 0x33>, < 0x32>;
-   dma-names = "tx", "rx";
+   dmas = < 0x33>, < 0x32>,
+  < 0x33>, < 0x32>;
+   dma-names = "tx", "rx", "tx", "rx";
power-domains = < R8A7795_PD_ALWAYS_ON>;
resets = < 519>;
status = "disabled";
@@ -1110,8 +1112,9 @@
 < CPG_CORE R8A7795_CLK_S3D1>,
 <_clk>;
clock-names = "fck", "brg_int", "scif_clk";
-   dmas = < 0x35>, < 0x34>;
-   dma-names = "tx", "rx";
+   dmas = < 0x35>, < 0x34>,
+  < 0x35>, < 0x34>;
+   dma-names = "tx", "rx", "tx", "rx";
power-domains = < R8A7795_PD_ALWAYS_ON>;
resets = < 518>;
status = "disabled";
@@ -1222,8 +1225,9 @@
 < CPG_CORE R8A7795_CLK_S3D1>,
 <_clk>;
clock-names = "fck", "brg_int", "scif_clk";
-   dmas = < 0x51>, < 0x50>;
-   dma-names = "tx", "rx";
+   dmas = < 0x51>, < 0x50>,
+  < 0x51>, < 0x50>;
+   dma-names = "tx", "rx", "tx", "rx";
power-domains = < R8A7795_PD_ALWAYS_ON>;
resets = < 207>;
status = "disabled";
@@ -1238,8 +1242,9 @@
 < CPG_CORE R8A7795_CLK_S3D1>,
 <_clk>;
clock-names = "fck", "brg_int", "scif_clk";
-   dmas = < 0x53>, < 0x52>;
-   dma-names = "tx", "rx";
+   dmas = < 0x53>, < 0x52>,
+  < 0x53>, < 0x52>;
+   dma-names = "tx", "rx", "tx", "rx";
power-domains = < R8A7795_PD_ALWAYS_ON>;
resets = < 206>;
status = "disabled";
@@ -1302,8 +1307,9 @@
 < CPG_CORE R8A7795_CLK_S3D1>,
 <_clk>;
clock-names = "fck", "brg_int", "scif_clk";
-   dmas = < 0x5b>, < 0x5a>;
-   dma-names = "tx", "rx";
+   dmas = < 0x5b>, < 0x5a>,
+  < 0x5b>, < 0x5a>;
+   dma-names = "tx", "rx", "tx", "rx";
power-domains = < R8A7795_PD_ALWAYS_ON>;
resets = < 202>;
status = "disabled";
@@ -1335,8 +1341,9 @@
clocks = < CPG_MOD 931>;
power-domains = < R8A7795_PD_ALWAYS_ON>;
resets = < 931>;
-   dmas = < 0x91>, < 0x90>;
-   dma-names = "tx", "rx";
+   dmas = < 0x91>, < 0x90>,
+  < 0x91>, < 0x90>;
+   dma-names = "tx", "rx", "tx", "rx";
i2c-scl-internal-delay-ns = <110>;
status = "disabled";