diff mbox

ARM: shmobile: marzen: Board specific serial port order

Message ID 20150807024533.25666.34925.sendpatchset@little-apple (mailing list archive)
State Accepted
Commit 8025e3ff4ca972a0ca2aa898562670a767f79889
Delegated to: Simon Horman
Headers show

Commit Message

Magnus Damm Aug. 7, 2015, 2:45 a.m. UTC 
From: Magnus Damm <damm+renesas@opensource.se>

Convert Marzen to use board-specific serial0 and serial1 instead
of the older shared SoC-specific SCIF index.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---

 Cooked up against renesas-devel-20150807-v4.2-rc5

 arch/arm/boot/dts/r8a7779-marzen.dts |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

Comments

Geert Uytterhoeven Aug. 7, 2015, 7:13 a.m. UTC | #1 
Hi Magnus,

On Fri, Aug 7, 2015 at 4:45 AM, Magnus Damm <magnus.damm@gmail.com> wrote:
> From: Magnus Damm <damm+renesas@opensource.se>
>
> Convert Marzen to use board-specific serial0 and serial1 instead
> of the older shared SoC-specific SCIF index.

Thank you for your patch!

Please note that this is a user-visible change.
Hardcoded "ttySC2" in e.g. kernel boot command line and /etc/inittab must be
changed to ttySC0.

> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>

Nevertheless:
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

> --- 0001/arch/arm/boot/dts/r8a7779-marzen.dts
> +++ work/arch/arm/boot/dts/r8a7779-marzen.dts   2015-08-07 11:04:37.432366518 +0900
> @@ -19,12 +19,12 @@
>         compatible = "renesas,marzen", "renesas,r8a7779";
>
>         aliases {
> -               serial2 = &scif2;
> -               serial4 = &scif4;
> +               serial0 = &scif2;
> +               serial1 = &scif4;
>         };
>
>         chosen {
> -               bootargs = "console=ttySC2,115200 ignore_loglevel root=/dev/nfs ip=on";

The "console=..." part can indeed be removed, now legacy marzen is gone.

> +               bootargs = "ignore_loglevel root=/dev/nfs ip=on";
>                 stdout-path = &scif2;
>         };
Laurent Pinchart Aug. 7, 2015, 10:19 a.m. UTC | #2 
On Friday 07 August 2015 09:13:08 Geert Uytterhoeven wrote:
> Hi Magnus,
> 
> On Fri, Aug 7, 2015 at 4:45 AM, Magnus Damm <magnus.damm@gmail.com> wrote:
> > From: Magnus Damm <damm+renesas@opensource.se>
> > 
> > Convert Marzen to use board-specific serial0 and serial1 instead
> > of the older shared SoC-specific SCIF index.
> 
> Thank you for your patch!
> 
> Please note that this is a user-visible change.
> Hardcoded "ttySC2" in e.g. kernel boot command line and /etc/inittab must be
> changed to ttySC0.
> 
> > Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> 
> Nevertheless:
> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

And

Acked-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

given how long I've been pushing for this :-)

> > --- 0001/arch/arm/boot/dts/r8a7779-marzen.dts
> > +++ work/arch/arm/boot/dts/r8a7779-marzen.dts   2015-08-07
> > 11:04:37.432366518 +0900 @@ -19,12 +19,12 @@
> >         compatible = "renesas,marzen", "renesas,r8a7779";
> >         
> >         aliases {
> > -               serial2 = &scif2;
> > -               serial4 = &scif4;
> > +               serial0 = &scif2;
> > +               serial1 = &scif4;
> >         };
> >         
> >         chosen {
> > -               bootargs = "console=ttySC2,115200 ignore_loglevel
> > root=/dev/nfs ip=on";
>
> The "console=..." part can indeed be removed, now legacy marzen is gone.
>
> > +               bootargs = "ignore_loglevel root=/dev/nfs ip=on";
> >                 stdout-path = &scif2;
> >         };
Simon Horman Aug. 12, 2015, 2:21 a.m. UTC | #3 
On Fri, Aug 07, 2015 at 01:19:59PM +0300, Laurent Pinchart wrote:
> On Friday 07 August 2015 09:13:08 Geert Uytterhoeven wrote:
> > Hi Magnus,
> > 
> > On Fri, Aug 7, 2015 at 4:45 AM, Magnus Damm <magnus.damm@gmail.com> wrote:
> > > From: Magnus Damm <damm+renesas@opensource.se>
> > > 
> > > Convert Marzen to use board-specific serial0 and serial1 instead
> > > of the older shared SoC-specific SCIF index.
> > 
> > Thank you for your patch!
> > 
> > Please note that this is a user-visible change.
> > Hardcoded "ttySC2" in e.g. kernel boot command line and /etc/inittab must be
> > changed to ttySC0.
> > 
> > > Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> > 
> > Nevertheless:
> > Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
> 
> And
> 
> Acked-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> 
> given how long I've been pushing for this :-)

Thanks, I have queued this up for v4.4.
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

--- 0001/arch/arm/boot/dts/r8a7779-marzen.dts
+++ work/arch/arm/boot/dts/r8a7779-marzen.dts	2015-08-07 11:04:37.432366518 +0900
@@ -19,12 +19,12 @@ 
 	compatible = "renesas,marzen", "renesas,r8a7779";
 
 	aliases {
-		serial2 = &scif2;
-		serial4 = &scif4;
+		serial0 = &scif2;
+		serial1 = &scif4;
 	};
 
 	chosen {
-		bootargs = "console=ttySC2,115200 ignore_loglevel root=/dev/nfs ip=on";
+		bootargs = "ignore_loglevel root=/dev/nfs ip=on";
 		stdout-path = &scif2;
 	};