* [PATCH 0/3] r8a7796 SCIF integration
@ 2016-09-14 16:46 Ulrich Hecht
2016-09-14 16:46 ` [PATCH 1/3] clk: shmobile: r8a7796: Add SCIF clocks Ulrich Hecht
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Ulrich Hecht @ 2016-09-14 16:46 UTC (permalink / raw)
To: linux-renesas-soc, geert; +Cc: magnus.damm, horms, Ulrich Hecht
Hi!
This enables SCIFs 0, 1, 3, 4, and 5.
Based on renesas-drivers-2016-09-13-v4.8-rc6. The last patch enables DMA for
all SCIFs and depends on the "r8a7796 SYS-DMAC integration" series posted
earlier.
CU
Uli
Ulrich Hecht (3):
clk: shmobile: r8a7796: Add SCIF clocks
arm64: renesas: r8a7796: Add all SCIF nodes
arm64: renesas: r8a7796: Enable SCIF DMA
arch/arm64/boot/dts/renesas/r8a7796.dtsi | 77 ++++++++++++++++++++++++++++++++
drivers/clk/renesas/r8a7796-cpg-mssr.c | 5 +++
2 files changed, 82 insertions(+)
--
2.9.3
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/3] clk: shmobile: r8a7796: Add SCIF clocks
2016-09-14 16:46 [PATCH 0/3] r8a7796 SCIF integration Ulrich Hecht
@ 2016-09-14 16:46 ` Ulrich Hecht
2016-09-15 18:30 ` Geert Uytterhoeven
2016-09-14 16:46 ` [PATCH 2/3] arm64: renesas: r8a7796: Add all SCIF nodes Ulrich Hecht
2016-09-14 16:46 ` [PATCH 3/3] arm64: renesas: r8a7796: Enable SCIF DMA Ulrich Hecht
2 siblings, 1 reply; 9+ messages in thread
From: Ulrich Hecht @ 2016-09-14 16:46 UTC (permalink / raw)
To: linux-renesas-soc, geert; +Cc: magnus.damm, horms, Ulrich Hecht
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
drivers/clk/renesas/r8a7796-cpg-mssr.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/clk/renesas/r8a7796-cpg-mssr.c b/drivers/clk/renesas/r8a7796-cpg-mssr.c
index 5cabcaa..2c1f597 100644
--- a/drivers/clk/renesas/r8a7796-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7796-cpg-mssr.c
@@ -109,6 +109,11 @@ static const struct cpg_core_clk r8a7796_core_clks[] __initconst = {
};
static const struct mssr_mod_clk r8a7796_mod_clks[] __initconst = {
+ DEF_MOD("scif5", 202, R8A7796_CLK_S3D4),
+ DEF_MOD("scif4", 203, R8A7796_CLK_S3D4),
+ DEF_MOD("scif3", 204, R8A7796_CLK_S3D4),
+ DEF_MOD("scif1", 206, R8A7796_CLK_S3D4),
+ DEF_MOD("scif0", 207, R8A7796_CLK_S3D4),
DEF_MOD("sys-dmac2", 217, R8A7796_CLK_S3D1),
DEF_MOD("sys-dmac1", 218, R8A7796_CLK_S3D1),
DEF_MOD("sys-dmac0", 219, R8A7796_CLK_S3D1),
--
2.9.3
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/3] arm64: renesas: r8a7796: Add all SCIF nodes
2016-09-14 16:46 [PATCH 0/3] r8a7796 SCIF integration Ulrich Hecht
2016-09-14 16:46 ` [PATCH 1/3] clk: shmobile: r8a7796: Add SCIF clocks Ulrich Hecht
@ 2016-09-14 16:46 ` Ulrich Hecht
2016-09-15 18:33 ` Geert Uytterhoeven
2016-09-14 16:46 ` [PATCH 3/3] arm64: renesas: r8a7796: Enable SCIF DMA Ulrich Hecht
2 siblings, 1 reply; 9+ messages in thread
From: Ulrich Hecht @ 2016-09-14 16:46 UTC (permalink / raw)
To: linux-renesas-soc, geert; +Cc: magnus.damm, horms, Ulrich Hecht
Add the device nodes for all R-Car H3 SCIF serial ports, incl. clocks
and clock domain.
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
arch/arm64/boot/dts/renesas/r8a7796.dtsi | 65 ++++++++++++++++++++++++++++++++
1 file changed, 65 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index 7c4d11c..e59ded4 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -347,6 +347,32 @@
status = "disabled";
};
+ scif0: serial@e6e60000 {
+ compatible = "renesas,scif-r8a7796",
+ "renesas,rcar-gen3-scif", "renesas,scif";
+ reg = <0 0xe6e60000 0 64>;
+ interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cpg CPG_MOD 207>,
+ <&cpg CPG_CORE R8A7796_CLK_S3D1>,
+ <&scif_clk>;
+ clock-names = "fck", "brg_int", "scif_clk";
+ power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+ status = "disabled";
+ };
+
+ scif1: serial@e6e68000 {
+ compatible = "renesas,scif-r8a7796",
+ "renesas,rcar-gen3-scif", "renesas,scif";
+ reg = <0 0xe6e68000 0 64>;
+ interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cpg CPG_MOD 206>,
+ <&cpg CPG_CORE R8A7796_CLK_S3D1>,
+ <&scif_clk>;
+ clock-names = "fck", "brg_int", "scif_clk";
+ power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+ status = "disabled";
+ };
+
scif2: serial@e6e88000 {
compatible = "renesas,scif-r8a7796",
"renesas,rcar-gen3-scif", "renesas,scif";
@@ -360,6 +386,45 @@
status = "disabled";
};
+ scif3: serial@e6c50000 {
+ compatible = "renesas,scif-r8a7796",
+ "renesas,rcar-gen3-scif", "renesas,scif";
+ reg = <0 0xe6c50000 0 64>;
+ interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cpg CPG_MOD 204>,
+ <&cpg CPG_CORE R8A7796_CLK_S3D1>,
+ <&scif_clk>;
+ clock-names = "fck", "brg_int", "scif_clk";
+ power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+ status = "disabled";
+ };
+
+ scif4: serial@e6c40000 {
+ compatible = "renesas,scif-r8a7796",
+ "renesas,rcar-gen3-scif", "renesas,scif";
+ reg = <0 0xe6c40000 0 64>;
+ interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cpg CPG_MOD 203>,
+ <&cpg CPG_CORE R8A7796_CLK_S3D1>,
+ <&scif_clk>;
+ clock-names = "fck", "brg_int", "scif_clk";
+ power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+ status = "disabled";
+ };
+
+ scif5: serial@e6f30000 {
+ compatible = "renesas,scif-r8a7796",
+ "renesas,rcar-gen3-scif", "renesas,scif";
+ reg = <0 0xe6f30000 0 64>;
+ interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cpg CPG_MOD 202>,
+ <&cpg CPG_CORE R8A7796_CLK_S3D1>,
+ <&scif_clk>;
+ clock-names = "fck", "brg_int", "scif_clk";
+ power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+ status = "disabled";
+ };
+
dmac0: dma-controller@e6700000 {
compatible = "renesas,dmac-r8a7796",
"renesas,rcar-dmac";
--
2.9.3
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/3] arm64: renesas: r8a7796: Enable SCIF DMA
2016-09-14 16:46 [PATCH 0/3] r8a7796 SCIF integration Ulrich Hecht
2016-09-14 16:46 ` [PATCH 1/3] clk: shmobile: r8a7796: Add SCIF clocks Ulrich Hecht
2016-09-14 16:46 ` [PATCH 2/3] arm64: renesas: r8a7796: Add all SCIF nodes Ulrich Hecht
@ 2016-09-14 16:46 ` Ulrich Hecht
2016-09-15 18:38 ` Geert Uytterhoeven
2 siblings, 1 reply; 9+ messages in thread
From: Ulrich Hecht @ 2016-09-14 16:46 UTC (permalink / raw)
To: linux-renesas-soc, geert; +Cc: magnus.damm, horms, Ulrich Hecht
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
arch/arm64/boot/dts/renesas/r8a7796.dtsi | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index e59ded4..d2bbf92 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -356,6 +356,8 @@
<&cpg CPG_CORE R8A7796_CLK_S3D1>,
<&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk";
+ dmas = <&dmac1 0x51>, <&dmac1 0x50>;
+ dma-names = "tx", "rx";
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
status = "disabled";
};
@@ -369,6 +371,8 @@
<&cpg CPG_CORE R8A7796_CLK_S3D1>,
<&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk";
+ dmas = <&dmac1 0x53>, <&dmac1 0x52>;
+ dma-names = "tx", "rx";
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
status = "disabled";
};
@@ -382,6 +386,8 @@
<&cpg CPG_CORE R8A7796_CLK_S3D1>,
<&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk";
+ dmas = <&dmac1 0x13>, <&dmac1 0x12>;
+ dma-names = "tx", "rx";
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
status = "disabled";
};
@@ -395,6 +401,8 @@
<&cpg CPG_CORE R8A7796_CLK_S3D1>,
<&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk";
+ dmas = <&dmac0 0x57>, <&dmac0 0x56>;
+ dma-names = "tx", "rx";
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
status = "disabled";
};
@@ -408,6 +416,8 @@
<&cpg CPG_CORE R8A7796_CLK_S3D1>,
<&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk";
+ dmas = <&dmac0 0x59>, <&dmac0 0x58>;
+ dma-names = "tx", "rx";
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
status = "disabled";
};
@@ -421,6 +431,8 @@
<&cpg CPG_CORE R8A7796_CLK_S3D1>,
<&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk";
+ dmas = <&dmac1 0x5b>, <&dmac1 0x5a>;
+ dma-names = "tx", "rx";
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
status = "disabled";
};
--
2.9.3
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] clk: shmobile: r8a7796: Add SCIF clocks
2016-09-14 16:46 ` [PATCH 1/3] clk: shmobile: r8a7796: Add SCIF clocks Ulrich Hecht
@ 2016-09-15 18:30 ` Geert Uytterhoeven
2016-09-20 9:00 ` Geert Uytterhoeven
0 siblings, 1 reply; 9+ messages in thread
From: Geert Uytterhoeven @ 2016-09-15 18:30 UTC (permalink / raw)
To: Ulrich Hecht; +Cc: Linux-Renesas, Magnus Damm, Simon Horman
On Wed, Sep 14, 2016 at 6:46 PM, Ulrich Hecht
<ulrich.hecht+renesas@gmail.com> wrote:
> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@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] 9+ messages in thread
* Re: [PATCH 2/3] arm64: renesas: r8a7796: Add all SCIF nodes
2016-09-14 16:46 ` [PATCH 2/3] arm64: renesas: r8a7796: Add all SCIF nodes Ulrich Hecht
@ 2016-09-15 18:33 ` Geert Uytterhoeven
2016-09-16 9:45 ` Simon Horman
0 siblings, 1 reply; 9+ messages in thread
From: Geert Uytterhoeven @ 2016-09-15 18:33 UTC (permalink / raw)
To: Ulrich Hecht; +Cc: Linux-Renesas, Magnus Damm, Simon Horman
On Wed, Sep 14, 2016 at 6:46 PM, Ulrich Hecht
<ulrich.hecht+renesas@gmail.com> wrote:
> Add the device nodes for all R-Car H3 SCIF serial ports, incl. clocks
> and clock domain.
>
> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@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] 9+ messages in thread
* Re: [PATCH 3/3] arm64: renesas: r8a7796: Enable SCIF DMA
2016-09-14 16:46 ` [PATCH 3/3] arm64: renesas: r8a7796: Enable SCIF DMA Ulrich Hecht
@ 2016-09-15 18:38 ` Geert Uytterhoeven
0 siblings, 0 replies; 9+ messages in thread
From: Geert Uytterhoeven @ 2016-09-15 18:38 UTC (permalink / raw)
To: Ulrich Hecht; +Cc: Linux-Renesas, Magnus Damm, Simon Horman
On Wed, Sep 14, 2016 at 6:46 PM, Ulrich Hecht
<ulrich.hecht+renesas@gmail.com> wrote:
> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> arch/arm64/boot/dts/renesas/r8a7796.dtsi | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
> index e59ded4..d2bbf92 100644
> --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
> +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
> @@ -356,6 +356,8 @@
> <&cpg CPG_CORE R8A7796_CLK_S3D1>,
> <&scif_clk>;
> clock-names = "fck", "brg_int", "scif_clk";
> + dmas = <&dmac1 0x51>, <&dmac1 0x50>;
Same question as for i2c: please add the dmas pointing to dmac2 where
appropriate, if that works.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@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] 9+ messages in thread
* Re: [PATCH 2/3] arm64: renesas: r8a7796: Add all SCIF nodes
2016-09-15 18:33 ` Geert Uytterhoeven
@ 2016-09-16 9:45 ` Simon Horman
0 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2016-09-16 9:45 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Ulrich Hecht, Linux-Renesas, Magnus Damm
On Thu, Sep 15, 2016 at 08:33:38PM +0200, Geert Uytterhoeven wrote:
> On Wed, Sep 14, 2016 at 6:46 PM, Ulrich Hecht
> <ulrich.hecht+renesas@gmail.com> wrote:
> > Add the device nodes for all R-Car H3 SCIF serial ports, incl. clocks
> > and clock domain.
> >
> > Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Unfortunately this does not apply to my tree.
Ulrich, please consider rebasing the latest renesas/next branch
(currently renesas-next-20160908-v4.8-rc1 tag) and reposting.
I'd be happy to see this patch reposted without the rest of the series
if that would be most expedient for you.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] clk: shmobile: r8a7796: Add SCIF clocks
2016-09-15 18:30 ` Geert Uytterhoeven
@ 2016-09-20 9:00 ` Geert Uytterhoeven
0 siblings, 0 replies; 9+ messages in thread
From: Geert Uytterhoeven @ 2016-09-20 9:00 UTC (permalink / raw)
To: Ulrich Hecht; +Cc: Linux-Renesas, Magnus Damm, Simon Horman
On Thu, Sep 15, 2016 at 8:30 PM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> On Wed, Sep 14, 2016 at 6:46 PM, Ulrich Hecht
> <ulrich.hecht+renesas@gmail.com> wrote:
>> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Queueing in clk-renesas-for-v4.10 with s/shmobile/renesas/.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@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] 9+ messages in thread
end of thread, other threads:[~2016-09-20 9:00 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-14 16:46 [PATCH 0/3] r8a7796 SCIF integration Ulrich Hecht
2016-09-14 16:46 ` [PATCH 1/3] clk: shmobile: r8a7796: Add SCIF clocks Ulrich Hecht
2016-09-15 18:30 ` Geert Uytterhoeven
2016-09-20 9:00 ` Geert Uytterhoeven
2016-09-14 16:46 ` [PATCH 2/3] arm64: renesas: r8a7796: Add all SCIF nodes Ulrich Hecht
2016-09-15 18:33 ` Geert Uytterhoeven
2016-09-16 9:45 ` Simon Horman
2016-09-14 16:46 ` [PATCH 3/3] arm64: renesas: r8a7796: Enable SCIF DMA Ulrich Hecht
2016-09-15 18:38 ` Geert Uytterhoeven
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.