[PATCH 0/4] ARM: dts: iwg22d: DT architecture rework and UART

[PATCH 0/4] ARM: dts: iwg22d: DT architecture rework and UART

[Fabrizio Castro]

iWave's iW-RainboW-G22D SODIMM SOM Development Platform exposes three
serial interfaces on the HDMI daughter board, adding support for them
has triggered the creation of an additional device tree, file
r8a7745-iwg22d-sodimm-dbhd-ca.dts. Since the RZ/G1E based SoM is the
only RZ/G1 based module that can be put on the carrier board, there is
no need to make the new DT architecture that describes the configuration
with the daughter board on highly modular, as it can't be reused by SoM
with chip from manufacturers other than Renesas. Therefore, file
r8a7745-iwg22d-sodimm-dbhd-ca.dts includes file r8a7745-iwg22d-sodimm.dts
straight away. The user will take advantage of r8a7745-iwg22d-sodimm.dtb
when the daughter board is not connected to the carrier board, and he/she
will use r8a7745-iwg22d-sodimm-dbhd-ca.dtb to boot up the HW configuration
with the HDMI daughter board plugged in.
This series also adds support for hscif1 exposed on the carrier board, and
takes into account comments made on the similar rework of the DT
architecture for iWave's iW-RainboW-G22D SODIMM SOM Development Platform:
https://www.spinics.net/lists/arm-kernel/msg609681.html
by reordering the nodes in the carrier board DT.

Best regards,

Fabrizio Castro (4):
  ARM: dts: iwg22d: Use /dev/ttySC3 as debug console
  ARM: dts: iwg22d: Add /dev/ttySC5 support
  ARM: dts: iwg22d-sodimm-dbhd-ca: Add device tree for HDMI DB
  ARM: dts: iwg22d-sodimm: sort dt nodes

 arch/arm/boot/dts/Makefile                         |  1 +
 .../arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dts | 61 ++++++++++++++++++
 arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts        | 74 +++++++++++++---------
 3 files changed, 106 insertions(+), 30 deletions(-)
 create mode 100644 arch/arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dts

-- 
2.7.4

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/4] ARM: dts: iwg22d: Use /dev/ttySC3 as debug console

[Fabrizio Castro]

The BSP release from iWave uses /dev/ttySC3 as debug console, this patch
renames the alias accordingly for compatibility.

Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>
---
 arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts b/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
index 52153ec..edda4f1 100644
--- a/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
+++ b/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
@@ -16,7 +16,7 @@
 	compatible = "iwave,g22d", "iwave,g22m", "renesas,r8a7745";
 
 	aliases {
-		serial0 = &scif4;
+		serial3 = &scif4;
 		ethernet0 = &avb;
 	};
 
-- 
2.7.4

RE: [PATCH 1/4] ARM: dts: iwg22d: Use /dev/ttySC3 as debug console

[Biju Das]

Hi,

Looks like the chosen node "stdout-path = "serial0:115200n8";" is not updated with this patch.

So either drop the patch or fix the chosen node.

Regards,
Biju

> -----Original Message-----
> From: Fabrizio Castro [mailto:fabrizio.castro@bp.renesas.com]
> Sent: 13 October 2017 14:03
> To: Rob Herring <robh+dt@kernel.org>; Mark Rutland
> <mark.rutland@arm.com>; Russell King <linux@armlinux.org.uk>
> Cc: Simon Horman <horms@verge.net.au>; Magnus Damm
> <magnus.damm@gmail.com>; Geert Uytterhoeven <geert@linux-m68k.org>;
> devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org; linux-
> renesas-soc@vger.kernel.org; Chris Paterson <Chris.Paterson2@renesas.com>;
> Biju Das <biju.das@bp.renesas.com>; Fabrizio Castro
> <fabrizio.castro@bp.renesas.com>; Chris Paterson
> <Chris.Paterson2@renesas.com>
> Subject: [PATCH 1/4] ARM: dts: iwg22d: Use /dev/ttySC3 as debug console
>
> The BSP release from iWave uses /dev/ttySC3 as debug console, this patch
> renames the alias accordingly for compatibility.
>
> Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
> Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>
> ---
>  arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
> b/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
> index 52153ec..edda4f1 100644
> --- a/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
> +++ b/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
> @@ -16,7 +16,7 @@
>  compatible = "iwave,g22d", "iwave,g22m", "renesas,r8a7745";
>
>  aliases {
> -serial0 = &scif4;
> +serial3 = &scif4;
>  ethernet0 = &avb;
>  };
>
> --
> 2.7.4




Renesas Electronics Europe Ltd, Dukes Meadow, Millboard Road, Bourne End, Buckinghamshire, SL8 5FH, UK. Registered in England & Wales under Registered No. 04586709.

Re: [PATCH 1/4] ARM: dts: iwg22d: Use /dev/ttySC3 as debug console

[Simon Horman]

On Mon, Oct 16, 2017 at 08:34:35AM +0000, Biju Das wrote:
> Hi,
> 
> Looks like the chosen node "stdout-path = "serial0:115200n8";" is not updated with this patch.
> 
> So either drop the patch or fix the chosen node.

Please repost this patch with the above resolved.
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH 1/4] ARM: dts: iwg22d: Use /dev/ttySC3 as debug console

[Fabrizio Castro]

Hello Simon,

> > Hi,
> >
> > Looks like the chosen node "stdout-path = "serial0:115200n8";" is not updated with this patch.
> >
> > So either drop the patch or fix the chosen node.
>
> Please repost this patch with the above resolved.

I'll repost.

Best regards,
Fab



Renesas Electronics Europe Ltd, Dukes Meadow, Millboard Road, Bourne End, Buckinghamshire, SL8 5FH, UK. Registered in England & Wales under Registered No. 04586709.

[PATCH 2/4] ARM: dts: iwg22d: Add /dev/ttySC5 support

[Fabrizio Castro]

Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>
---
 arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts b/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
index edda4f1..5d5bb2f 100644
--- a/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
+++ b/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
@@ -17,6 +17,7 @@
 
 	aliases {
 		serial3 = &scif4;
+		serial5 = &hscif1;
 		ethernet0 = &avb;
 	};
 
@@ -39,7 +40,20 @@
 	};
 };
 
+&hscif1 {
+	pinctrl-0 = <&hscif1_pins>;
+	pinctrl-names = "default";
+
+	uart-has-rtscts;
+	status = "okay";
+};
+
 &pfc {
+	hscif1_pins: hscif1 {
+		groups = "hscif1_data", "hscif1_ctrl";
+		function = "hscif1";
+	};
+
 	scif4_pins: scif4 {
 		groups = "scif4_data_b";
 		function = "scif4";
-- 
2.7.4

Re: [PATCH 2/4] ARM: dts: iwg22d: Add /dev/ttySC5 support

[Simon Horman]

Please include some text in the changelog, ideally describing the
motivation (why not what) for this patch.


On Fri, Oct 13, 2017 at 02:03:14PM +0100, Fabrizio Castro wrote:
> Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
> Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>
> ---
>  arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts b/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
> index edda4f1..5d5bb2f 100644
> --- a/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
> +++ b/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
> @@ -17,6 +17,7 @@
>  
>  	aliases {
>  		serial3 = &scif4;
> +		serial5 = &hscif1;
>  		ethernet0 = &avb;
>  	};
>  
> @@ -39,7 +40,20 @@
>  	};
>  };
>  
> +&hscif1 {
> +	pinctrl-0 = <&hscif1_pins>;
> +	pinctrl-names = "default";
> +
> +	uart-has-rtscts;
> +	status = "okay";
> +};
> +
>  &pfc {
> +	hscif1_pins: hscif1 {
> +		groups = "hscif1_data", "hscif1_ctrl";
> +		function = "hscif1";
> +	};
> +
>  	scif4_pins: scif4 {
>  		groups = "scif4_data_b";
>  		function = "scif4";
> -- 
> 2.7.4
> 

RE: [PATCH 2/4] ARM: dts: iwg22d: Add /dev/ttySC5 support

[Fabrizio Castro]

Hello Simon,

>
> Please include some text in the changelog, ideally describing the
> motivation (why not what) for this patch.

Sure, I'll a description for v2. Thank you for the feedback.

Thanks,
Fab

>
>
> On Fri, Oct 13, 2017 at 02:03:14PM +0100, Fabrizio Castro wrote:
> > Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
> > Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>
> > ---
> >  arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 14 ++++++++++++++
> >  1 file changed, 14 insertions(+)
> >
> > diff --git a/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts b/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
> > index edda4f1..5d5bb2f 100644
> > --- a/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
> > +++ b/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
> > @@ -17,6 +17,7 @@
> >
> >  aliases {
> >  serial3 = &scif4;
> > +serial5 = &hscif1;
> >  ethernet0 = &avb;
> >  };
> >
> > @@ -39,7 +40,20 @@
> >  };
> >  };
> >
> > +&hscif1 {
> > +pinctrl-0 = <&hscif1_pins>;
> > +pinctrl-names = "default";
> > +
> > +uart-has-rtscts;
> > +status = "okay";
> > +};
> > +
> >  &pfc {
> > +hscif1_pins: hscif1 {
> > +groups = "hscif1_data", "hscif1_ctrl";
> > +function = "hscif1";
> > +};
> > +
> >  scif4_pins: scif4 {
> >  groups = "scif4_data_b";
> >  function = "scif4";
> > --
> > 2.7.4
> >



Renesas Electronics Europe Ltd, Dukes Meadow, Millboard Road, Bourne End, Buckinghamshire, SL8 5FH, UK. Registered in England & Wales under Registered No. 04586709.

[PATCH 3/4] ARM: dts: iwg22d-sodimm-dbhd-ca: Add device tree for HDMI DB

[Fabrizio Castro]

Add file r8a7745-iwg22d-sodimm-dbhd-ca.dts to provide support for
iW-RainboW-G22D with HDMI daughter board plugged in.

The interfaces defined in the new .dts file are: scif1, scif5,
and hscif2.

Signed-off-by: Fabrizio Castro <fabrizio.castro-kTT6dE0pTRh9uiUsa/gSgQ@public.gmane.org>
Signed-off-by: Chris Paterson <chris.paterson2-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
---
 arch/arm/boot/dts/Makefile                         |  1 +
 .../arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dts | 61 ++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 arch/arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dts

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 8c34d06..e27b194 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -727,6 +727,7 @@ dtb-$(CONFIG_ARCH_RENESAS) += \
 	r8a7743-iwg20d-q7-dbcm-ca.dtb \
 	r8a7743-sk-rzg1m.dtb \
 	r8a7745-iwg22d-sodimm.dtb \
+	r8a7745-iwg22d-sodimm-dbhd-ca.dtb \
 	r8a7745-sk-rzg1e.dtb \
 	r8a7778-bockw.dtb \
 	r8a7779-marzen.dtb \
diff --git a/arch/arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dts b/arch/arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dts
new file mode 100644
index 0000000..f925388
--- /dev/null
+++ b/arch/arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dts
@@ -0,0 +1,61 @@
+/*
+ * Device Tree Source for the iWave-RZG1E SODIMM carrier board + HDMI daughter
+ * board
+ *
+ * Copyright (C) 2017 Renesas Electronics Corp.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#include "r8a7745-iwg22d-sodimm.dts"
+
+/ {
+	model = "iWave RainboW-G22D-SODIMM RZ/G1E based board with HDMI add-on";
+	compatible = "iwave,g22d", "iwave,g22m", "renesas,r8a7745";
+
+	aliases {
+		serial0 = &scif1;
+		serial4 = &scif5;
+		serial6 = &hscif2;
+	};
+};
+
+&hscif2 {
+	pinctrl-0 = <&hscif2_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
+};
+
+&pfc {
+	hscif2_pins: hscif2 {
+		groups = "hscif2_data";
+		function = "hscif2";
+	};
+
+	scif1_pins: scif1 {
+		groups = "scif1_data";
+		function = "scif1";
+	};
+
+	scif5_pins: scif5 {
+		groups = "scif5_data_d";
+		function = "scif5";
+	};
+};
+
+&scif1 {
+	pinctrl-0 = <&scif1_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
+};
+
+&scif5 {
+	pinctrl-0 = <&scif5_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
+};
-- 
2.7.4

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 3/4] ARM: dts: iwg22d-sodimm-dbhd-ca: Add device tree for HDMI DB

[Simon Horman]

On Fri, Oct 13, 2017 at 02:03:15PM +0100, Fabrizio Castro wrote:
> Add file r8a7745-iwg22d-sodimm-dbhd-ca.dts to provide support for
> iW-RainboW-G22D with HDMI daughter board plugged in.
> 
> The interfaces defined in the new .dts file are: scif1, scif5,
> and hscif2.
> 
> Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
> Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>

I wonder if this patch should include a chosen node.

RE: [PATCH 3/4] ARM: dts: iwg22d-sodimm-dbhd-ca: Add device tree for HDMI DB

[Fabrizio Castro]

Hello Simon,

>
> On Fri, Oct 13, 2017 at 02:03:15PM +0100, Fabrizio Castro wrote:
> > Add file r8a7745-iwg22d-sodimm-dbhd-ca.dts to provide support for
> > iW-RainboW-G22D with HDMI daughter board plugged in.
> >
> > The interfaces defined in the new .dts file are: scif1, scif5,
> > and hscif2.
> >
> > Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
> > Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>
>
> I wonder if this patch should include a chosen node.

the chosen node gets inherited from file r8a7745-iwg22d-sodimm.dts,
I don't think the HW configuration with the carrier board should behave
any different from the HW configuration without the carrier board.

Thanks,
Fab



Renesas Electronics Europe Ltd, Dukes Meadow, Millboard Road, Bourne End, Buckinghamshire, SL8 5FH, UK. Registered in England & Wales under Registered No. 04586709.

[PATCH 4/4] ARM: dts: iwg22d-sodimm: sort dt nodes

[Fabrizio Castro]

Improve the layout of r8a7745-iwg22d-sodimm.dts by sorting the
nodes alphabetically.

Signed-off-by: Fabrizio Castro <fabrizio.castro-kTT6dE0pTRh9uiUsa/gSgQ@public.gmane.org>
Signed-off-by: Chris Paterson <chris.paterson2-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
---
 arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 62 ++++++++++++++---------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts b/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
index 5d5bb2f..5003a8f 100644
--- a/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
+++ b/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
@@ -16,9 +16,9 @@
 	compatible = "iwave,g22d", "iwave,g22m", "renesas,r8a7745";
 
 	aliases {
+		ethernet0 = &avb;
 		serial3 = &scif4;
 		serial5 = &hscif1;
-		ethernet0 = &avb;
 	};
 
 	chosen {
@@ -40,6 +40,25 @@
 	};
 };
 
+&avb {
+	pinctrl-0 = <&avb_pins>;
+	pinctrl-names = "default";
+
+	phy-handle = <&phy3>;
+	phy-mode = "gmii";
+	renesas,no-ether-link;
+	status = "okay";
+
+	phy3: ethernet-phy@3 {
+	/*
+	 * On some older versions of the platform (before R4.0) the phy address
+	 * may be 1 or 3. The address is fixed to 3 for R4.0 onwards.
+	 */
+		reg = <3>;
+		micrel,led-mode = <1>;
+	};
+};
+
 &hscif1 {
 	pinctrl-0 = <&hscif1_pins>;
 	pinctrl-names = "default";
@@ -48,7 +67,18 @@
 	status = "okay";
 };
 
+&pci1 {
+	status = "okay";
+	pinctrl-0 = <&usb1_pins>;
+	pinctrl-names = "default";
+};
+
 &pfc {
+	avb_pins: avb {
+		groups = "avb_mdio", "avb_gmii";
+		function = "avb";
+	};
+
 	hscif1_pins: hscif1 {
 		groups = "hscif1_data", "hscif1_ctrl";
 		function = "hscif1";
@@ -59,11 +89,6 @@
 		function = "scif4";
 	};
 
-	avb_pins: avb {
-		groups = "avb_mdio", "avb_gmii";
-		function = "avb";
-	};
-
 	sdhi0_pins: sd0 {
 		groups = "sdhi0_data4", "sdhi0_ctrl";
 		function = "sdhi0";
@@ -83,25 +108,6 @@
 	status = "okay";
 };
 
-&avb {
-	pinctrl-0 = <&avb_pins>;
-	pinctrl-names = "default";
-
-	phy-handle = <&phy3>;
-	phy-mode = "gmii";
-	renesas,no-ether-link;
-	status = "okay";
-
-	phy3: ethernet-phy@3 {
-	/*
-	 * On some older versions of the platform (before R4.0) the phy address
-	 * may be 1 or 3. The address is fixed to 3 for R4.0 onwards.
-	 */
-		reg = <3>;
-		micrel,led-mode = <1>;
-	};
-};
-
 &sdhi0 {
 	pinctrl-0 = <&sdhi0_pins>;
 	pinctrl-names = "default";
@@ -112,12 +118,6 @@
 	status = "okay";
 };
 
-&pci1 {
-	status = "okay";
-	pinctrl-0 = <&usb1_pins>;
-	pinctrl-names = "default";
-};
-
 &usbphy {
 	status = "okay";
 };
-- 
2.7.4

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html