* [PATCH] arm64: dts: renesas: r8a7795: Add missing SYS-DMAC2 dmas
@ 2018-03-08 14:10 Geert Uytterhoeven
2018-03-09 22:03 ` Niklas Söderlund
2018-03-13 18:43 ` Simon Horman
0 siblings, 2 replies; 5+ messages in thread
From: Geert Uytterhoeven @ 2018-03-08 14:10 UTC (permalink / raw)
To: linux-arm-kernel
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 <geert+renesas@glider.be>
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] arm64: dts: renesas: r8a7795: Add missing SYS-DMAC2 dmas
2018-03-08 14:10 [PATCH] arm64: dts: renesas: r8a7795: Add missing SYS-DMAC2 dmas Geert Uytterhoeven
@ 2018-03-09 22:03 ` Niklas Söderlund
2018-03-13 18:43 ` Simon Horman
1 sibling, 0 replies; 5+ messages in thread
From: Niklas Söderlund @ 2018-03-09 22:03 UTC (permalink / raw)
To: linux-arm-kernel
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 <geert+renesas@glider.be>
Reviewed-by: Niklas S?derlund <niklas.soderlund+renesas@ragnatech.se>
> ---
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] arm64: dts: renesas: r8a7795: Add missing SYS-DMAC2 dmas
2018-03-08 14:10 [PATCH] arm64: dts: renesas: r8a7795: Add missing SYS-DMAC2 dmas Geert Uytterhoeven
2018-03-09 22:03 ` Niklas Söderlund
@ 2018-03-13 18:43 ` Simon Horman
2018-03-13 19:23 ` Geert Uytterhoeven
1 sibling, 1 reply; 5+ messages in thread
From: Simon Horman @ 2018-03-13 18:43 UTC (permalink / raw)
To: linux-arm-kernel
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 <geert+renesas@glider.be>
Thanks, applied.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] arm64: dts: renesas: r8a7795: Add missing SYS-DMAC2 dmas
2018-03-13 18:43 ` Simon Horman
@ 2018-03-13 19:23 ` Geert Uytterhoeven
2018-03-16 8:43 ` Simon Horman
0 siblings, 1 reply; 5+ messages in thread
From: Geert Uytterhoeven @ 2018-03-13 19:23 UTC (permalink / raw)
To: linux-arm-kernel
Hi Simon,
On Tue, Mar 13, 2018 at 7:43 PM, Simon Horman <horms@verge.net.au> 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 <geert+renesas@glider.be>
>
> Thanks, applied.
This one, or v2?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] arm64: dts: renesas: r8a7795: Add missing SYS-DMAC2 dmas
2018-03-13 19:23 ` Geert Uytterhoeven
@ 2018-03-16 8:43 ` Simon Horman
0 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2018-03-16 8:43 UTC (permalink / raw)
To: linux-arm-kernel
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 <horms@verge.net.au> 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 <geert+renesas@glider.be>
> >
> > Thanks, applied.
>
> This one, or v2?
v2
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-03-16 8:43 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-08 14:10 [PATCH] arm64: dts: renesas: r8a7795: Add missing SYS-DMAC2 dmas Geert Uytterhoeven
2018-03-09 22:03 ` Niklas Söderlund
2018-03-13 18:43 ` Simon Horman
2018-03-13 19:23 ` Geert Uytterhoeven
2018-03-16 8:43 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).