diff mbox

[v4,05/11] ARM: shmobile: r7s72100: genmai: add uart aliases and activate scif2 as console

Message ID 1398704521-23767-6-git-send-email-wsa@the-dreams.de (mailing list archive)
State New, archived
Headers show

Commit Message

Wolfram Sang April 28, 2014, 5:01 p.m. UTC
From: Wolfram Sang <wsa+renesas@sang-engineering.com>

We keep the UART naming backwards compatible with the legacy version.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 arch/arm/boot/dts/r7s72100-genmai-reference.dts | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

Comments

Magnus Damm April 29, 2014, 6:23 a.m. UTC | #1
On Mon, Apr 28, 2014 at 5:01 PM, Wolfram Sang <wsa@the-dreams.de> wrote:
> From: Wolfram Sang <wsa+renesas@sang-engineering.com>
>
> We keep the UART naming backwards compatible with the legacy version.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> ---
>  arch/arm/boot/dts/r7s72100-genmai-reference.dts | 18 +++++++++++++++++-
>  1 file changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/r7s72100-genmai-reference.dts b/arch/arm/boot/dts/r7s72100-genmai-reference.dts
> index 941e72ce7c82..facff0271716 100644
> --- a/arch/arm/boot/dts/r7s72100-genmai-reference.dts
> +++ b/arch/arm/boot/dts/r7s72100-genmai-reference.dts
> @@ -1,7 +1,8 @@
>  /*
>   * Device Tree Source for the Genmai board
>   *
> - * Copyright (C) 2013 Renesas Solutions Corp.
> + * Copyright (C) 2013-14 Renesas Solutions Corp.
> + * Copyright (C) 2014 Wolfram Sang, Sang Engineering <wsa@sang-engineering.com>
>   *
>   * 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
> @@ -15,6 +16,17 @@
>         model = "Genmai";
>         compatible = "renesas,genmai-reference", "renesas,r7s72100";
>
> +       aliases {
> +               serial0 = &scif0;
> +               serial1 = &scif1;
> +               serial2 = &scif2;
> +               serial3 = &scif3;
> +               serial4 = &scif4;
> +               serial5 = &scif5;
> +               serial6 = &scif6;
> +               serial7 = &scif7;
> +       };
> +
>         chosen {
>                 bootargs = "console=ttySC2,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
>         };

Hi Wolfram,

Thanks for your updated series. For this patch I only have a minor
comment. I believe we only want to enable the serial port that is used
on the board. At the same time we want to keep the same ordering as
the legacy code. I believe you keep the same order already and only
enable ttySC2, but I wonder if you really need all the aliases above?
Perhaps it is possible to keep just serial2?

Cheers,

/ magnus
Wolfram Sang April 29, 2014, 7:21 a.m. UTC | #2
Hi Magnus,

> Thanks for your updated series. For this patch I only have a minor
> comment. I believe we only want to enable the serial port that is used
> on the board. At the same time we want to keep the same ordering as
> the legacy code. I believe you keep the same order already and only
> enable ttySC2, but I wonder if you really need all the aliases above?
> Perhaps it is possible to keep just serial2?

Yeah, this is easily possible. I wanted to add the additional aliases
because the other SCIF pins are available on the external connectors and
wanted potential users to save some hassle. Let me know if you think
this is not needed and I will resend this patch only taking care of
SCIF2.

Thanks,

   Wolfram
Simon Horman April 29, 2014, 7:35 a.m. UTC | #3
On Tue, Apr 29, 2014 at 09:21:43AM +0200, Wolfram Sang wrote:
> Hi Magnus,
> 
> > Thanks for your updated series. For this patch I only have a minor
> > comment. I believe we only want to enable the serial port that is used
> > on the board. At the same time we want to keep the same ordering as
> > the legacy code. I believe you keep the same order already and only
> > enable ttySC2, but I wonder if you really need all the aliases above?
> > Perhaps it is possible to keep just serial2?
> 
> Yeah, this is easily possible. I wanted to add the additional aliases
> because the other SCIF pins are available on the external connectors and
> wanted potential users to save some hassle. Let me know if you think
> this is not needed and I will resend this patch only taking care of
> SCIF2.

It seems that when enabling devices in DT there is a preference
for only enabling devices that are actually exposed on the board.

So at the risk of being contradicted by Magnus and others
my recommendation is to remove the aliases that Magnus highlighted.
Wolfram Sang April 29, 2014, 7:43 a.m. UTC | #4
> So at the risk of being contradicted by Magnus and others
> my recommendation is to remove the aliases that Magnus highlighted.

OK. Shall I resend the series or only this patch?
Simon Horman April 29, 2014, 8:21 a.m. UTC | #5
On Tue, Apr 29, 2014 at 09:43:58AM +0200, Wolfram Sang wrote:
> > So at the risk of being contradicted by Magnus and others
> > my recommendation is to remove the aliases that Magnus highlighted.
> 
> OK. Shall I resend the series or only this patch?

I'd prefer a repost of the entire series if it is not too much trouble.
diff mbox

Patch

diff --git a/arch/arm/boot/dts/r7s72100-genmai-reference.dts b/arch/arm/boot/dts/r7s72100-genmai-reference.dts
index 941e72ce7c82..facff0271716 100644
--- a/arch/arm/boot/dts/r7s72100-genmai-reference.dts
+++ b/arch/arm/boot/dts/r7s72100-genmai-reference.dts
@@ -1,7 +1,8 @@ 
 /*
  * Device Tree Source for the Genmai board
  *
- * Copyright (C) 2013 Renesas Solutions Corp.
+ * Copyright (C) 2013-14 Renesas Solutions Corp.
+ * Copyright (C) 2014 Wolfram Sang, Sang Engineering <wsa@sang-engineering.com>
  *
  * 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
@@ -15,6 +16,17 @@ 
 	model = "Genmai";
 	compatible = "renesas,genmai-reference", "renesas,r7s72100";
 
+	aliases {
+		serial0 = &scif0;
+		serial1 = &scif1;
+		serial2 = &scif2;
+		serial3 = &scif3;
+		serial4 = &scif4;
+		serial5 = &scif5;
+		serial6 = &scif6;
+		serial7 = &scif7;
+	};
+
 	chosen {
 		bootargs = "console=ttySC2,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
 	};
@@ -48,3 +60,7 @@ 
 		pagesize = <64>;
 	};
 };
+
+&scif2 {
+	status = "okay";
+};