* [PATCH 1/2] arm64: dts: renesas: r8a77990: Fix SCIF5 DMA channels
2019-03-15 10:14 [GIT PULL] Renesas ARM Based SoC Fixes for v5.1 Simon Horman
@ 2019-03-15 10:14 ` Simon Horman
2019-03-15 10:14 ` [PATCH 2/2] arm64: dts: renesas: r8a774c0: " Simon Horman
2019-03-25 16:03 ` [GIT PULL] Renesas ARM Based SoC Fixes for v5.1 Arnd Bergmann
2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2019-03-15 10:14 UTC (permalink / raw)
To: linux-renesas-soc
Cc: Simon Horman, Takeshi Kihara, Magnus Damm, Geert Uytterhoeven,
linux-arm-kernel
From: Takeshi Kihara <takeshi.kihara.df@renesas.com>
According to the R-Car Gen3 Hardware Manual Errata for Rev 1.50 of Feb
12, 2019, the DMA channels for SCIF5 are corrected from 16..47 to 0..15
on R-Car E3.
Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
Fixes: a5ebe5e49a862e21 ("arm64: dts: renesas: r8a77990: Add SCIF-{0,1,3,4,5} device nodes")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm64/boot/dts/renesas/r8a77990.dtsi | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/boot/dts/renesas/r8a77990.dtsi b/arch/arm64/boot/dts/renesas/r8a77990.dtsi
index 786178cf1ffd..36f409091cfc 100644
--- a/arch/arm64/boot/dts/renesas/r8a77990.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77990.dtsi
@@ -2,7 +2,7 @@
/*
* Device Tree Source for the R-Car E3 (R8A77990) SoC
*
- * Copyright (C) 2018 Renesas Electronics Corp.
+ * Copyright (C) 2018-2019 Renesas Electronics Corp.
*/
#include <dt-bindings/clock/r8a77990-cpg-mssr.h>
@@ -1042,9 +1042,8 @@
<&cpg CPG_CORE R8A77990_CLK_S3D1C>,
<&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk";
- dmas = <&dmac1 0x5b>, <&dmac1 0x5a>,
- <&dmac2 0x5b>, <&dmac2 0x5a>;
- dma-names = "tx", "rx", "tx", "rx";
+ dmas = <&dmac0 0x5b>, <&dmac0 0x5a>;
+ dma-names = "tx", "rx";
power-domains = <&sysc R8A77990_PD_ALWAYS_ON>;
resets = <&cpg 202>;
status = "disabled";
--
2.11.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] arm64: dts: renesas: r8a774c0: Fix SCIF5 DMA channels
2019-03-15 10:14 [GIT PULL] Renesas ARM Based SoC Fixes for v5.1 Simon Horman
2019-03-15 10:14 ` [PATCH 1/2] arm64: dts: renesas: r8a77990: Fix SCIF5 DMA channels Simon Horman
@ 2019-03-15 10:14 ` Simon Horman
2019-03-25 16:03 ` [GIT PULL] Renesas ARM Based SoC Fixes for v5.1 Arnd Bergmann
2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2019-03-15 10:14 UTC (permalink / raw)
To: linux-renesas-soc
Cc: Simon Horman, Takeshi Kihara, Magnus Damm, Geert Uytterhoeven,
linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Correct the DMA channels for SCIF5 from 16..47 to 0..15, as was done for
R-Car E3.
Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
Fixes: 2660a6af690ebbb4 ("arm64: dts: renesas: r8a774c0: Add SCIF and HSCIF nodes")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/boot/dts/renesas/r8a774c0.dtsi b/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
index f2e390f7f1d5..6590b63268b0 100644
--- a/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
@@ -2,7 +2,7 @@
/*
* Device Tree Source for the RZ/G2E (R8A774C0) SoC
*
- * Copyright (C) 2018 Renesas Electronics Corp.
+ * Copyright (C) 2018-2019 Renesas Electronics Corp.
*/
#include <dt-bindings/clock/r8a774c0-cpg-mssr.h>
@@ -990,9 +990,8 @@
<&cpg CPG_CORE R8A774C0_CLK_S3D1C>,
<&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk";
- dmas = <&dmac1 0x5b>, <&dmac1 0x5a>,
- <&dmac2 0x5b>, <&dmac2 0x5a>;
- dma-names = "tx", "rx", "tx", "rx";
+ dmas = <&dmac0 0x5b>, <&dmac0 0x5a>;
+ dma-names = "tx", "rx";
power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
resets = <&cpg 202>;
status = "disabled";
--
2.11.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [GIT PULL] Renesas ARM Based SoC Fixes for v5.1
2019-03-15 10:14 [GIT PULL] Renesas ARM Based SoC Fixes for v5.1 Simon Horman
2019-03-15 10:14 ` [PATCH 1/2] arm64: dts: renesas: r8a77990: Fix SCIF5 DMA channels Simon Horman
2019-03-15 10:14 ` [PATCH 2/2] arm64: dts: renesas: r8a774c0: " Simon Horman
@ 2019-03-25 16:03 ` Arnd Bergmann
2 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2019-03-25 16:03 UTC (permalink / raw)
To: Simon Horman
Cc: Kevin Hilman, Magnus Damm, Linux-Renesas, arm-soc,
Olof Johansson, Linux ARM
On Fri, Mar 15, 2019 at 11:14 AM Simon Horman
<horms+renesas@verge.net.au> wrote:
>
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these Renesas ARM based SoC fixes for v5.1.
>
> This pull request is based on
> "[GIT PULL] Second Round of Renesas ARM64 Based SoC DT Updates for v5.1",
> which was taged as renesas-arm64-dt-for-v5.1 and you have already pulled.
>
> The reason for this base is that the fix for RZ/G2E (r8a774c0) resolves a
> problem introduced in ARM64 Based SoC DT Updates for v5.1.
>
> The fix for E3 (r8a77990) resolves a problem introduced in v5.0.
Pulled into fixes, thanks!
Arnd
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread