Skip to contentSkip to conversation

ARM: shmobile: marzen: Board specific serial port order

PATCH In review Magnus Damm 4 participants 4 messages Aug 7, 2015 – Aug 12, 2015

Subsystems (2)
Device tree bindings SuperH
lore
Share & tools
lore

Magnus Damm

author
#0 lore raw

PATCH 1/1 ARM: shmobile: marzen: Board specific serial port order

From: Magnus Damm <[email protected]>

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

Signed-off-by Magnus Damm <[email protected]>

---

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

 arch/arm/boot/dts/r8a7779-marzen.dts |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/r8a7779-marzen.dts +3 -3
@@ -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;
 	};
Acked-by on v1 1/1
#1 lore raw

Hi Magnus,

Quoted 4 lines · Magnus Damm

From: Magnus Damm <[email protected]>

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.

Quoted 1 line
Signed-off-by Magnus Damm <[email protected]>

Nevertheless:

Acked-by Geert Uytterhoeven <[email protected]>
Quoted 4 lines
arch/arm/boot/dts/r8a7779-marzen.dts 2015-08-07 11:04:37.432366518 +0900 renamed from arch/arm/boot/dts/r8a7779-marzen.dts +0 -0
@@ -19,12 +19,12 @@
        compatible = "renesas,marzen", "renesas,r8a7779";

arch/arm/boot/dts/r8a7779-marzen.dts 2015-08-07 11:04:37.432366518 +0900 line 27

Quoted 10 lines
arch/arm/boot/dts/r8a7779-marzen.dts 2015-08-07 11:04:37.432366518 +0900 renamed from arch/arm/boot/dts/r8a7779-marzen.dts +2 -3
 
        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.

Quoted 3 lines
arch/arm/boot/dts/r8a7779-marzen.dts 2015-08-07 11:04:37.432366518 +0900 renamed from arch/arm/boot/dts/r8a7779-marzen.dts +1 -0
+               bootargs = "ignore_loglevel root=/dev/nfs ip=on";
                stdout-path = &scif2;
        };
Signature · 10 lines
Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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
Acked-by on v1 1/1
#2 lore raw
In reply to Magnus Damm
Quoted 10 lines · On Friday 07 August 2015 09:13:08 Geert Uytterhoeven wrote:

Hi Magnus,

Quoted 4 lines · Magnus Damm

From: Magnus Damm <[email protected]>

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

Thank you for your patch!

Quoted 8 lines

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.

Quoted 1 line
Signed-off-by Magnus Damm <[email protected]>

Nevertheless:

Acked-by Geert Uytterhoeven <[email protected]>

And

Acked-by Laurent Pinchart <[email protected]>

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

Quoted 21 lines
Quoted 14 lines
arch/arm/boot/dts/r8a7779-marzen.dts 2015-08-07 renamed from arch/arm/boot/dts/r8a7779-marzen.dts +0 -0

11:04:37.432366518 +0900 @@ -19,12 +19,12 @@

        compatible = "renesas,marzen", "renesas,r8a7779";
        
        aliases {
arch/arm/boot/dts/r8a7779-marzen.dts 2015-08-07 renamed from arch/arm/boot/dts/r8a7779-marzen.dts +2 -3
-               serial2 = &scif2;
-               serial4 = &scif4;
+               serial0 = &scif2;
+               serial1 = &scif4;
        };
 
        chosen {
-               bootargs = "console=ttySC2,115200 ignore_loglevel
Quoted 1 line

root=/dev/nfs ip=on";

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

Quoted 3 lines
+               bootargs = "ignore_loglevel root=/dev/nfs ip=on";
                stdout-path = &scif2;
        };
Signature · 3 lines
Regards,

Laurent Pinchart
#3 lore raw
In reply to Magnus Damm
Quoted 17 lines · Laurent Pinchart
Quoted 16 lines · On Friday 07 August 2015 09:13:08 Geert Uytterhoeven wrote:

Hi Magnus,

Quoted 4 lines · Magnus Damm

From: Magnus Damm <[email protected]>

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.

Quoted 1 line
Signed-off-by Magnus Damm <[email protected]>
Quoted 8 lines
Quoted 2 lines

Nevertheless:

Acked-by Geert Uytterhoeven <[email protected]>

And

Acked-by Laurent Pinchart <[email protected]>

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

Thanks, I have queued this up for v4.4.