[PATCH 0/4] ARM: dts: r8a777[89]: HSCIF support

[PATCH 0/4] ARM: dts: r8a777[89]: HSCIF support

[Ulrich Hecht]

Hi!

This adds HSCIF nodes to the r8a7778 and r8a7779 device trees.
(And the relevant clocks on r8a7778, which are already there on r8a7779.)

CU
Uli


Ulrich Hecht (4):
  ARM: dts: r8a7778: Add HSCIF0/1 clocks
  ARM: dts: r8a7778: Add HSCIF0/1 device nodes
  ARM: dts: r8a7779: Add HSCIF0/1 device nodes
  serial: sh-sci: add r8a7778/9 HSCIF DT bindings

 .../bindings/serial/renesas,sci-serial.txt         |  2 ++
 arch/arm/boot/dts/r8a7778.dtsi                     | 30 ++++++++++++++++++++++
 arch/arm/boot/dts/r8a7779.dtsi                     | 26 +++++++++++++++++++
 include/dt-bindings/clock/r8a7778-clock.h          |  2 ++
 4 files changed, 60 insertions(+)

-- 
2.6.4

[PATCH 1/4] ARM: dts: r8a7778: Add HSCIF0/1 clocks

[Ulrich Hecht]

Based on Rev. 1.00 of the R-Car M1A datasheet.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
 arch/arm/boot/dts/r8a7778.dtsi            | 4 ++++
 include/dt-bindings/clock/r8a7778-clock.h | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
index f83a348..0407df1 100644
--- a/arch/arm/boot/dts/r8a7778.dtsi
+++ b/arch/arm/boot/dts/r8a7778.dtsi
@@ -543,6 +543,8 @@
 				 <&cpg_clocks R8A7778_CLK_P>,
 				 <&cpg_clocks R8A7778_CLK_P>,
 				 <&cpg_clocks R8A7778_CLK_P>,
+				 <&cpg_clocks R8A7778_CLK_S>,
+				 <&cpg_clocks R8A7778_CLK_S>,
 				 <&cpg_clocks R8A7778_CLK_P>,
 				 <&cpg_clocks R8A7778_CLK_P>,
 				 <&cpg_clocks R8A7778_CLK_P>,
@@ -559,6 +561,7 @@
 				R8A7778_CLK_SCIF0 R8A7778_CLK_SCIF1
 				R8A7778_CLK_SCIF2 R8A7778_CLK_SCIF3
 				R8A7778_CLK_SCIF4 R8A7778_CLK_SCIF5
+				R8A7778_CLK_HSCIF0 R8A7778_CLK_HSCIF1
 				R8A7778_CLK_TMU0 R8A7778_CLK_TMU1
 				R8A7778_CLK_TMU2 R8A7778_CLK_SSI0
 				R8A7778_CLK_SSI1 R8A7778_CLK_SSI2
@@ -568,6 +571,7 @@
 			clock-output-names =
 				"i2c0", "i2c1", "i2c2", "i2c3", "scif0",
 				"scif1", "scif2", "scif3", "scif4", "scif5",
+				"hscif0", "hscif1",
 				"tmu0", "tmu1", "tmu2", "ssi0", "ssi1",
 				"ssi2", "ssi3", "sru", "hspi";
 		};
diff --git a/include/dt-bindings/clock/r8a7778-clock.h b/include/dt-bindings/clock/r8a7778-clock.h
index f6b07c5..d0bff9e 100644
--- a/include/dt-bindings/clock/r8a7778-clock.h
+++ b/include/dt-bindings/clock/r8a7778-clock.h
@@ -30,6 +30,8 @@
 #define R8A7778_CLK_SCIF3	23
 #define R8A7778_CLK_SCIF4	22
 #define R8A7778_CLK_SCIF5	21
+#define R8A7778_CLK_HSCIF0	19
+#define R8A7778_CLK_HSCIF1	18
 #define R8A7778_CLK_TMU0	16
 #define R8A7778_CLK_TMU1	15
 #define R8A7778_CLK_TMU2	14
-- 
2.6.4

[PATCH 2/4] ARM: dts: r8a7778: Add HSCIF0/1 device nodes

[Ulrich Hecht]

Based on Rev. 1.00 of the R-Car M1A datasheet.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
 arch/arm/boot/dts/r8a7778.dtsi | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
index 0407df1..cd80778 100644
--- a/arch/arm/boot/dts/r8a7778.dtsi
+++ b/arch/arm/boot/dts/r8a7778.dtsi
@@ -368,6 +368,32 @@
 		status = "disabled";
 	};
 
+	hscif0: serial@ffe48000 {
+		compatible = "renesas,hscif-r8a7778",
+			     "renesas,rcar-gen1-hscif", "renesas,hscif";
+		reg = <0 0xffe48000 0 96>;
+		interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp0_clks R8A7778_CLK_HSCIF0>,
+			 <&cpg_clocks R8A7778_CLK_S>,
+			 <&scif_clk>;
+		clock-names = "fck", "brg_int", "scif_clk";
+		power-domains = <&cpg_clocks>;
+		status = "disabled";
+	};
+
+	hscif1: serial@ffe49000 {
+		compatible = "renesas,hscif-r8a7778",
+			     "renesas,rcar-gen1-hscif", "renesas,hscif";
+		reg = <0 0xffe49000 0 96>;
+		interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp0_clks R8A7778_CLK_HSCIF0>,
+			 <&cpg_clocks R8A7778_CLK_S>,
+			 <&scif_clk>;
+		clock-names = "fck", "brg_int", "scif_clk";
+		power-domains = <&cpg_clocks>;
+		status = "disabled";
+	};
+
 	mmcif: mmc@ffe4e000 {
 		compatible = "renesas,sh-mmcif";
 		reg = <0xffe4e000 0x100>;
-- 
2.6.4

[PATCH 3/4] ARM: dts: r8a7779: Add HSCIF0/1 device nodes

[Ulrich Hecht]

Based on Rev. 1.00 of the R-Car H1 datasheet.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
 arch/arm/boot/dts/r8a7779.dtsi | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index 14b28c2..71a48c0 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -285,6 +285,32 @@
 		status = "disabled";
 	};
 
+	hscif0: serial@ffe48000 {
+		compatible = "renesas,hscif-r8a7779",
+			     "renesas,rcar-gen1-hscif", "renesas,hscif";
+		reg = <0 0xffe48000 0 96>;
+		interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp0_clks R8A7779_CLK_HSCIF0>,
+			 <&cpg_clocks R8A7779_CLK_S>,
+			 <&scif_clk>;
+		clock-names = "fck", "brg_int", "scif_clk";
+		power-domains = <&cpg_clocks>;
+		status = "disabled";
+	};
+
+	hscif1: serial@ffe49000 {
+		compatible = "renesas,hscif-r8a7779",
+			     "renesas,rcar-gen1-hscif", "renesas,hscif";
+		reg = <0 0xffe49000 0 96>;
+		interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp0_clks R8A7779_CLK_HSCIF0>,
+			 <&cpg_clocks R8A7779_CLK_S>,
+			 <&scif_clk>;
+		clock-names = "fck", "brg_int", "scif_clk";
+		power-domains = <&cpg_clocks>;
+		status = "disabled";
+	};
+
 	pfc: pfc@fffc0000 {
 		compatible = "renesas,pfc-r8a7779";
 		reg = <0xfffc0000 0x23c>;
-- 
2.6.4

[PATCH 4/4] serial: sh-sci: add r8a7778/9 HSCIF DT bindings

[Ulrich Hecht]

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
 Documentation/devicetree/bindings/serial/renesas,sci-serial.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt b/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
index 528c3b9..61d6adc 100644
--- a/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
+++ b/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
@@ -10,7 +10,9 @@ Required properties:
     - "renesas,scifa-r8a7740" for R8A7740 (R-Mobile A1) SCIFA compatible UART.
     - "renesas,scifb-r8a7740" for R8A7740 (R-Mobile A1) SCIFB compatible UART.
     - "renesas,scif-r8a7778" for R8A7778 (R-Car M1) SCIF compatible UART.
+    - "renesas,hscif-r8a7778" for R8A7778 (R-Car M1) HSCIF compatible UART.
     - "renesas,scif-r8a7779" for R8A7779 (R-Car H1) SCIF compatible UART.
+    - "renesas,hscif-r8a7779" for R8A7779 (R-Car H1) HSCIF compatible UART.
     - "renesas,scif-r8a7790" for R8A7790 (R-Car H2) SCIF compatible UART.
     - "renesas,scifa-r8a7790" for R8A7790 (R-Car H2) SCIFA compatible UART.
     - "renesas,scifb-r8a7790" for R8A7790 (R-Car H2) SCIFB compatible UART.
-- 
2.6.4

Re: [PATCH 4/4] serial: sh-sci: add r8a7778/9 HSCIF DT bindings

[Simon Horman]

On Wed, Mar 16, 2016 at 06:10:10PM +0100, Ulrich Hecht wrote:
> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
> ---
>  Documentation/devicetree/bindings/serial/renesas,sci-serial.txt | 2 ++
>  1 file changed, 2 insertions(+)

Reviewed-by: Simon Horman <horms+renesas@verge.net.au>

Re: [PATCH 0/4] ARM: dts: r8a777[89]: HSCIF support

[Simon Horman]

Hi Ulrich,

thanks for posting this. It (and several other items you have posted
recently) have been on my todo list for a while.

I have looked over the patches and I agree that they appear to
match the documentation for the SoCs in question which in turn
appears to match the documentation for HSCIF on RCar Gen2.

I was also unable to find any obvious errors when I looked
at the node properties, mstp, irq and base address settings.

>From my point of view it would be best if the driver change (the last patch
in the series) could progress (via Greg) before the DT updates are merged
(most likely by me).

On Wed, Mar 16, 2016 at 06:10:06PM +0100, Ulrich Hecht wrote:
> Hi!
> 
> This adds HSCIF nodes to the r8a7778 and r8a7779 device trees.
> (And the relevant clocks on r8a7778, which are already there on r8a7779.)
> 
> CU
> Uli
> 
> 
> Ulrich Hecht (4):
>   ARM: dts: r8a7778: Add HSCIF0/1 clocks
>   ARM: dts: r8a7778: Add HSCIF0/1 device nodes
>   ARM: dts: r8a7779: Add HSCIF0/1 device nodes
>   serial: sh-sci: add r8a7778/9 HSCIF DT bindings
> 
>  .../bindings/serial/renesas,sci-serial.txt         |  2 ++
>  arch/arm/boot/dts/r8a7778.dtsi                     | 30 ++++++++++++++++++++++
>  arch/arm/boot/dts/r8a7779.dtsi                     | 26 +++++++++++++++++++
>  include/dt-bindings/clock/r8a7778-clock.h          |  2 ++
>  4 files changed, 60 insertions(+)
> 
> -- 
> 2.6.4
> 

Re: [PATCH 1/4] ARM: dts: r8a7778: Add HSCIF0/1 clocks

[Geert Uytterhoeven]

On Wed, Mar 16, 2016 at 6:10 PM, Ulrich Hecht
<ulrich.hecht+renesas@gmail.com> wrote:
> Based on Rev. 1.00 of the R-Car M1A datasheet.
>
> 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

Re: [PATCH 2/4] ARM: dts: r8a7778: Add HSCIF0/1 device nodes

[Geert Uytterhoeven]

On Wed, Mar 16, 2016 at 6:10 PM, Ulrich Hecht
<ulrich.hecht+renesas@gmail.com> wrote:
> Based on Rev. 1.00 of the R-Car M1A datasheet.
>
> 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

Re: [PATCH 3/4] ARM: dts: r8a7779: Add HSCIF0/1 device nodes

[Geert Uytterhoeven]

On Wed, Mar 16, 2016 at 6:10 PM, Ulrich Hecht
<ulrich.hecht+renesas@gmail.com> wrote:
> Based on Rev. 1.00 of the R-Car H1 datasheet.
>
> 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

Re: [PATCH 4/4] serial: sh-sci: add r8a7778/9 HSCIF DT bindings

[Geert Uytterhoeven]

On Wed, Mar 16, 2016 at 6:10 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

Re: [PATCH 0/4] ARM: dts: r8a777[89]: HSCIF support

[Geert Uytterhoeven]

Hi Ulrich,

On Wed, Mar 16, 2016 at 6:10 PM, Ulrich Hecht
<ulrich.hecht+renesas@gmail.com> wrote:
> This adds HSCIF nodes to the r8a7778 and r8a7779 device trees.
> (And the relevant clocks on r8a7778, which are already there on r8a7779.)

Just wondering: have you tested this?

It seems serial0 on Bock-W can be pinmuxed to HSCIF0 instead of SCIF0.
On Marzen it's less easy, probably you need physical access to expansion
connectors.

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

Re: [PATCH 0/4] ARM: dts: r8a777[89]: HSCIF support

[Ulrich Hecht]

On Thu, Mar 17, 2016 at 9:06 AM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> Hi Ulrich,
>
> On Wed, Mar 16, 2016 at 6:10 PM, Ulrich Hecht
> <ulrich.hecht+renesas@gmail.com> wrote:
>> This adds HSCIF nodes to the r8a7778 and r8a7779 device trees.
>> (And the relevant clocks on r8a7778, which are already there on r8a7779.)
>
> Just wondering: have you tested this?

No, I don't have any Gen1 boards ATM.

CU
Uli