[PATCH v2 00/13] ARM: shmobile: dts: Add chosen/stdout-path

[PATCH v2 00/13] ARM: shmobile: dts: Add chosen/stdout-path

[Geert Uytterhoeven]

	Hi Simon, Magnus,

This patch series adds chosen/stdout-path to the various shmobile DTS files
that are used for reference or multi-platform builds.

This serves two purposes:
  1. It makes automatic console selection work in the absence of a "console="
     parameter on the kernel command line, allowing to remove "console="
     parameters from chosen/bootargs on many platforms.
     Note that these "console=" parameters are still needed in some cases:
       a. If console output is wanted on two consoles devices (graphical and
          serial consoles), like on armadillo and kzm9g,
       b. When using a non-default baud for the serial console, like on
          henninger and alt,
       c. If the DTS is shared between legacy and multi-platform, like on
          armadillo, koelsch, lager, and marzen,
  2. It will allow the PM domain code to find the PM domain for the console
     device, to make "no_console_suspend" work in the DT case.
     For now, this will matter on armadillo.

The first two patches are small cleanups for emev2 dtsi, on top of which the
change for kzm9d is built.

Changes in v2:
  - Keep "console" for DTSes shared between legacy and multi-platform,
  - Update for lager switching the console from scif0 to scifa0.

Thanks for applying!

Geert Uytterhoeven (13):
  ARM: shmobile: emev2 dtsi: Use generic names for device nodes
  ARM: shmobile: emev2 dtsi: Add uart* labels for easier referencing
  ARM: shmobile: kzm9d dts: Add chosen/stdout-path
  ARM: shmobile: genmai dts: Add chosen/stdout-path
  ARM: shmobile: ape6evm-reference dts: Add chosen/stdout-path
  ARM: shmobile: armadillo800eva dts: Add chosen/stdout-path
  ARM: shmobile: bockw-reference dts: Add chosen/stdout-path
  ARM: shmobile: marzen dts: Add chosen/stdout-path
  ARM: shmobile: lager dts: Add chosen/stdout-path
  ARM: shmobile: henninger dts: Add chosen/stdout-path
  ARM: shmobile: koelsch dts: Add chosen/stdout-path
  ARM: shmobile: alt dts: Add chosen/stdout-path
  ARM: shmobile: kzm9g-reference dts: Add chosen/stdout-path

 arch/arm/boot/dts/emev2-kzm9d.dts               |  3 ++-
 arch/arm/boot/dts/emev2.dtsi                    | 12 ++++++------
 arch/arm/boot/dts/r7s72100-genmai.dts           |  3 ++-
 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts |  3 ++-
 arch/arm/boot/dts/r8a7740-armadillo800eva.dts   |  1 +
 arch/arm/boot/dts/r8a7778-bockw-reference.dts   |  3 ++-
 arch/arm/boot/dts/r8a7779-marzen.dts            |  1 +
 arch/arm/boot/dts/r8a7790-lager.dts             |  1 +
 arch/arm/boot/dts/r8a7791-henninger.dts         |  1 +
 arch/arm/boot/dts/r8a7791-koelsch.dts           |  1 +
 arch/arm/boot/dts/r8a7794-alt.dts               |  1 +
 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts    |  1 +
 12 files changed, 21 insertions(+), 10 deletions(-)

-- 
1.9.1

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

[PATCH v2 01/13] ARM: shmobile: emev2 dtsi: Use generic names for device nodes

[Geert Uytterhoeven]

smu -> clocks
sti -> timer
uart -> serial

All but "clocks" are defined in ePAPR v1.1.

Signed-off-by: Geert Uytterhoeven <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
---
v2:
  - No changes
---
 arch/arm/boot/dts/emev2.dtsi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/emev2.dtsi b/arch/arm/boot/dts/emev2.dtsi
index 00eeed3721b63bfe..5fe9212b6bc5e50b 100644
--- a/arch/arm/boot/dts/emev2.dtsi
+++ b/arch/arm/boot/dts/emev2.dtsi
@@ -55,7 +55,7 @@
 			     <0 121 IRQ_TYPE_LEVEL_HIGH>;
 	};
 
-	smu@e0110000 {
+	clocks@e0110000 {
 		compatible = "renesas,emev2-smu";
 		reg = <0xe0110000 0x10000>;
 		#address-cells = <2>;
@@ -129,7 +129,7 @@
 		};
 	};
 
-	sti@e0180000 {
+	timer@e0180000 {
 		compatible = "renesas,em-sti";
 		reg = <0xe0180000 0x54>;
 		interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH>;
@@ -137,7 +137,7 @@
 		clock-names = "sclk";
 	};
 
-	uart@e1020000 {
+	serial@e1020000 {
 		compatible = "renesas,em-uart";
 		reg = <0xe1020000 0x38>;
 		interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>;
@@ -145,7 +145,7 @@
 		clock-names = "sclk";
 	};
 
-	uart@e1030000 {
+	serial@e1030000 {
 		compatible = "renesas,em-uart";
 		reg = <0xe1030000 0x38>;
 		interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>;
@@ -153,7 +153,7 @@
 		clock-names = "sclk";
 	};
 
-	uart@e1040000 {
+	serial@e1040000 {
 		compatible = "renesas,em-uart";
 		reg = <0xe1040000 0x38>;
 		interrupts = <0 10 IRQ_TYPE_LEVEL_HIGH>;
@@ -161,7 +161,7 @@
 		clock-names = "sclk";
 	};
 
-	uart@e1050000 {
+	serial@e1050000 {
 		compatible = "renesas,em-uart";
 		reg = <0xe1050000 0x38>;
 		interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>;
-- 
1.9.1

--
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 v2 02/13] ARM: shmobile: emev2 dtsi: Add uart* labels for easier referencing

[Geert Uytterhoeven]

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - No changes
---
 arch/arm/boot/dts/emev2.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/emev2.dtsi b/arch/arm/boot/dts/emev2.dtsi
index 5fe9212b6bc5e50b..cc7bfe0ba40af9a9 100644
--- a/arch/arm/boot/dts/emev2.dtsi
+++ b/arch/arm/boot/dts/emev2.dtsi
@@ -137,7 +137,7 @@
 		clock-names = "sclk";
 	};
 
-	serial@e1020000 {
+	uart0: serial@e1020000 {
 		compatible = "renesas,em-uart";
 		reg = <0xe1020000 0x38>;
 		interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>;
@@ -145,7 +145,7 @@
 		clock-names = "sclk";
 	};
 
-	serial@e1030000 {
+	uart1: serial@e1030000 {
 		compatible = "renesas,em-uart";
 		reg = <0xe1030000 0x38>;
 		interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>;
@@ -153,7 +153,7 @@
 		clock-names = "sclk";
 	};
 
-	serial@e1040000 {
+	uart2: serial@e1040000 {
 		compatible = "renesas,em-uart";
 		reg = <0xe1040000 0x38>;
 		interrupts = <0 10 IRQ_TYPE_LEVEL_HIGH>;
@@ -161,7 +161,7 @@
 		clock-names = "sclk";
 	};
 
-	serial@e1050000 {
+	uart3: serial@e1050000 {
 		compatible = "renesas,em-uart";
 		reg = <0xe1050000 0x38>;
 		interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>;
-- 
1.9.1

[PATCH v2 03/13] ARM: shmobile: kzm9d dts: Add chosen/stdout-path

[Geert Uytterhoeven]

Add a stdout-path property so that automatic console selection works
in the absence of a "console=" parameter on the kernel command line.

Remove the now-superfluous "console=" parameter from chosen/bootargs.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - No changes
---
 arch/arm/boot/dts/emev2-kzm9d.dts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/emev2-kzm9d.dts b/arch/arm/boot/dts/emev2-kzm9d.dts
index a1794cbd23fee319..d01baba9e56f7781 100644
--- a/arch/arm/boot/dts/emev2-kzm9d.dts
+++ b/arch/arm/boot/dts/emev2-kzm9d.dts
@@ -24,7 +24,8 @@
 	};
 
 	chosen {
-		bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp";
+		bootargs = "ignore_loglevel root=/dev/nfs ip=dhcp";
+		stdout-path = &uart1;
 	};
 
 	gpio_keys {
-- 
1.9.1

Re: [PATCH v2 03/13] ARM: shmobile: kzm9d dts: Add chosen/stdout-path

[Simon Horman]

On Fri, Oct 03, 2014 at 05:11:34PM +0200, Geert Uytterhoeven wrote:
> Add a stdout-path property so that automatic console selection works
> in the absence of a "console=" parameter on the kernel command line.
> 
> Remove the now-superfluous "console=" parameter from chosen/bootargs.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

In my environment the bootargs portion of this change results
in no console output. I am guessing that this is because the
console starts with a different terminal speed (though which speed
I am unsure).

If my guess is correct then strictly speaking this is not a bug,
though it is a behavioural change. And as such I think at the very
least it needs some discussion.

> ---
> v2:
>   - No changes
> ---
>  arch/arm/boot/dts/emev2-kzm9d.dts | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/emev2-kzm9d.dts b/arch/arm/boot/dts/emev2-kzm9d.dts
> index a1794cbd23fee319..d01baba9e56f7781 100644
> --- a/arch/arm/boot/dts/emev2-kzm9d.dts
> +++ b/arch/arm/boot/dts/emev2-kzm9d.dts
> @@ -24,7 +24,8 @@
>  	};
>  
>  	chosen {
> -		bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp";
> +		bootargs = "ignore_loglevel root=/dev/nfs ip=dhcp";
> +		stdout-path = &uart1;
>  	};
>  
>  	gpio_keys {
> -- 
> 1.9.1
> 

Re: [PATCH v2 03/13] ARM: shmobile: kzm9d dts: Add chosen/stdout-path

[Geert Uytterhoeven]

Hi Simon,

On Mon, Oct 6, 2014 at 4:36 AM, Simon Horman <horms@verge.net.au> wrote:
> On Fri, Oct 03, 2014 at 05:11:34PM +0200, Geert Uytterhoeven wrote:
>> Add a stdout-path property so that automatic console selection works
>> in the absence of a "console=" parameter on the kernel command line.
>>
>> Remove the now-superfluous "console=" parameter from chosen/bootargs.
>>
>> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
>
> In my environment the bootargs portion of this change results
> in no console output. I am guessing that this is because the
> console starts with a different terminal speed (though which speed
> I am unsure).
>
> If my guess is correct then strictly speaking this is not a bug,
> though it is a behavioural change. And as such I think at the very
> least it needs some discussion.

I forgot emev is the only supported SoC not using sh-sci.
drivers/tty/serial/sh-sci.c:serial_console_setup() defaults to 115200 baud,
while serial8250_console_setup() defaults to 9600 baud.

So we have to keep the console= parameter. Will resend.

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 v2 03/13] ARM: shmobile: kzm9d dts: Add chosen/stdout-path

[Simon Horman]

On Mon, Oct 06, 2014 at 10:43:28AM +0200, Geert Uytterhoeven wrote:
> Hi Simon,
> 
> On Mon, Oct 6, 2014 at 4:36 AM, Simon Horman <horms@verge.net.au> wrote:
> > On Fri, Oct 03, 2014 at 05:11:34PM +0200, Geert Uytterhoeven wrote:
> >> Add a stdout-path property so that automatic console selection works
> >> in the absence of a "console=" parameter on the kernel command line.
> >>
> >> Remove the now-superfluous "console=" parameter from chosen/bootargs.
> >>
> >> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> >
> > In my environment the bootargs portion of this change results
> > in no console output. I am guessing that this is because the
> > console starts with a different terminal speed (though which speed
> > I am unsure).
> >
> > If my guess is correct then strictly speaking this is not a bug,
> > though it is a behavioural change. And as such I think at the very
> > least it needs some discussion.
> 
> I forgot emev is the only supported SoC not using sh-sci.
> drivers/tty/serial/sh-sci.c:serial_console_setup() defaults to 115200 baud,
> while serial8250_console_setup() defaults to 9600 baud.
> 
> So we have to keep the console= parameter. Will resend.

Thanks!

> 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
> --
> 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
> 

[PATCH v2 04/13] ARM: shmobile: genmai dts: Add chosen/stdout-path

[Geert Uytterhoeven]

Add a stdout-path property so that automatic console selection works
in the absence of a "console=" parameter on the kernel command line.

Remove the now-superfluous "console=" parameter from chosen/bootargs.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - No changes
---
 arch/arm/boot/dts/r7s72100-genmai.dts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r7s72100-genmai.dts b/arch/arm/boot/dts/r7s72100-genmai.dts
index a3ed23c0a8f58abd..1518c5bcca33d8d1 100644
--- a/arch/arm/boot/dts/r7s72100-genmai.dts
+++ b/arch/arm/boot/dts/r7s72100-genmai.dts
@@ -21,7 +21,8 @@
 	};
 
 	chosen {
-		bootargs = "console=ttySC2,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
+		bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
+		stdout-path = &scif2;
 	};
 
 	memory {
-- 
1.9.1

[PATCH v2 05/13] ARM: shmobile: ape6evm-reference dts: Add chosen/stdout-path

[Geert Uytterhoeven]

Add a stdout-path property so that automatic console selection works
in the absence of a "console=" parameter on the kernel command line.
In addition, this will allow the PM domain code to find the PM domain
for the console device.

Remove the now-superfluous "console=" parameter from chosen/bootargs.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - No changes
---
 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
index a860f32bca27fd8d..2bcf69124a6ab3ec 100644
--- a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
+++ b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
@@ -21,7 +21,8 @@
 	};
 
 	chosen {
-		bootargs = "console=ttySC0,115200 ignore_loglevel rw";
+		bootargs = "ignore_loglevel rw";
+		stdout-path = &scifa0;
 	};
 
 	memory@40000000 {
-- 
1.9.1

[PATCH v2 06/13] ARM: shmobile: armadillo800eva dts: Add chosen/stdout-path

[Geert Uytterhoeven]

Add a stdout-path property so that automatic console selection works
in the absence of a "console=" parameter on the kernel command line.
In addition, this will allow the PM domain code to find the PM domain
for the console device.

Note that we have to keep the "console=ttySC1" parameter in
chosen/bootargs, else we only get console messages on tty0, and because
this DTS is shared between legacy and multi-platform.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
This is a prerequisite for working "no_console_suspend" support in
"[PATCH] ARM: shmobile: R-Mobile: Add DT support for PM domains".

v2:
  - Add second reason for keeping "console="
---
 arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
index effb7b46f13172d5..2703428557fce9fa 100644
--- a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
@@ -25,6 +25,7 @@
 
 	chosen {
 		bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
+		stdout-path = &scifa1;
 	};
 
 	memory {
-- 
1.9.1

[PATCH v2 07/13] ARM: shmobile: bockw-reference dts: Add chosen/stdout-path

[Geert Uytterhoeven]

Add a stdout-path property so that automatic console selection works
in the absence of a "console=" parameter on the kernel command line.

Remove the now-superfluous "console=" parameter from chosen/bootargs.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - No changes
---
 arch/arm/boot/dts/r8a7778-bockw-reference.dts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7778-bockw-reference.dts b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
index 3342c74c5de890b1..fba294905ff42690 100644
--- a/arch/arm/boot/dts/r8a7778-bockw-reference.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
@@ -28,7 +28,8 @@
 	};
 
 	chosen {
-		bootargs = "console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
+		bootargs = "ignore_loglevel root=/dev/nfs ip=dhcp rw";
+		stdout-path = &scif0;
 	};
 
 	memory {
-- 
1.9.1

[PATCH v2 08/13] ARM: shmobile: marzen dts: Add chosen/stdout-path

[Geert Uytterhoeven]

Add a stdout-path property so that automatic console selection works
in the absence of a "console=" parameter on the kernel command line.

Note that we have to keep the "console=" parameter in chosen/bootargs,
as this DTS is shared between legacy and multi-platform.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - Keep "console="
---
 arch/arm/boot/dts/r8a7779-marzen.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts
index c160404e4d405eb2..9e1b859190ca48e4 100644
--- a/arch/arm/boot/dts/r8a7779-marzen.dts
+++ b/arch/arm/boot/dts/r8a7779-marzen.dts
@@ -25,6 +25,7 @@
 
 	chosen {
 		bootargs = "console=ttySC2,115200 ignore_loglevel root=/dev/nfs ip=on";
+		stdout-path = &scif2;
 	};
 
 	memory {
-- 
1.9.1

[PATCH v2 09/13] ARM: shmobile: lager dts: Add chosen/stdout-path

[Geert Uytterhoeven]

Add a stdout-path property so that automatic console selection works
in the absence of a "console=" parameter on the kernel command line.

Note that we have to keep the "console=" parameter in chosen/bootargs,
as this DTS is shared between legacy and multi-platform.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - Keep "console=",
  - Update for 3a8912c2f983dbb2 ("ARM: shmobile: r8a7790: switch from
    scif to scifa")
---
 arch/arm/boot/dts/r8a7790-lager.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 1698591d530a14df..719979e29bf8d47c 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -25,6 +25,7 @@
 
 	chosen {
 		bootargs = "console=ttySC6,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
+		stdout-path = &scifa0;
 	};
 
 	memory@40000000 {
-- 
1.9.1

[PATCH v2 10/13] ARM: shmobile: henninger dts: Add chosen/stdout-path

[Geert Uytterhoeven]

Add a stdout-path property so that automatic console selection works
in the absence of a "console=" parameter on the kernel command line.

Note that we have to keep the "console=ttySC0,38400" parameter in
chosen/bootargs, else the console will use the default setting of 115200
baud.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - No changes
---
 arch/arm/boot/dts/r8a7791-henninger.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/r8a7791-henninger.dts b/arch/arm/boot/dts/r8a7791-henninger.dts
index fee8befc4c70d29e..ef2cb9217aef9eb8 100644
--- a/arch/arm/boot/dts/r8a7791-henninger.dts
+++ b/arch/arm/boot/dts/r8a7791-henninger.dts
@@ -23,6 +23,7 @@
 
 	chosen {
 		bootargs = "console=ttySC0,38400 ignore_loglevel rw root=/dev/nfs ip=dhcp";
+		stdout-path = &scif0;
 	};
 
 	memory@40000000 {
-- 
1.9.1

[PATCH v2 11/13] ARM: shmobile: koelsch dts: Add chosen/stdout-path

[Geert Uytterhoeven]

Add a stdout-path property so that automatic console selection works
in the absence of a "console=" parameter on the kernel command line.

Note that we have to keep the "console=" parameter in chosen/bootargs,
as this DTS is shared between legacy and multi-platform.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - Keep "console="
---
 arch/arm/boot/dts/r8a7791-koelsch.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index 3f55c1673cfe2bf7..17cfcaace362b406 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -26,6 +26,7 @@
 
 	chosen {
 		bootargs = "console=ttySC6,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
+		stdout-path = &scif0;
 	};
 
 	memory@40000000 {
-- 
1.9.1

[PATCH v2 12/13] ARM: shmobile: alt dts: Add chosen/stdout-path

[Geert Uytterhoeven]

Add a stdout-path property so that automatic console selection works
in the absence of a "console=" parameter on the kernel command line.

Note that we have to keep the "console=ttySC0,38400" parameter in
chosen/bootargs, else the console will use the default setting of 115200
baud.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - No changes
---
 arch/arm/boot/dts/r8a7794-alt.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/r8a7794-alt.dts b/arch/arm/boot/dts/r8a7794-alt.dts
index 79d06ef017a05b77..8aec51268b7d8177 100644
--- a/arch/arm/boot/dts/r8a7794-alt.dts
+++ b/arch/arm/boot/dts/r8a7794-alt.dts
@@ -21,6 +21,7 @@
 
 	chosen {
 		bootargs = "console=ttySC0,38400 ignore_loglevel rw root=/dev/nfs ip=dhcp";
+		stdout-path = &scif2;
 	};
 
 	memory@40000000 {
-- 
1.9.1

Re: [PATCH v2 12/13] ARM: shmobile: alt dts: Add chosen/stdout-path

[Sergei Shtylyov]

Hello.

On 10/03/2014 07:11 PM, Geert Uytterhoeven wrote:

> Add a stdout-path property so that automatic console selection works
> in the absence of a "console=" parameter on the kernel command line.

> Note that we have to keep the "console=ttySC0,38400" parameter in
> chosen/bootargs, else the console will use the default setting of 115200
> baud.

    I've looked at the code and it appears that one can still specify a baud 
rate after ':' even in the "stdout-path" prop.

> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

WBR, Sergei

Re: [PATCH v2 12/13] ARM: shmobile: alt dts: Add chosen/stdout-path

[Geert Uytterhoeven]

Hi Sergei,

On Fri, Jan 30, 2015 at 11:33 PM, Sergei Shtylyov
<sergei.shtylyov-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org> wrote:
> On 10/03/2014 07:11 PM, Geert Uytterhoeven wrote:
>> Add a stdout-path property so that automatic console selection works
>> in the absence of a "console=" parameter on the kernel command line.
>
>> Note that we have to keep the "console=ttySC0,38400" parameter in
>> chosen/bootargs, else the console will use the default setting of 115200
>> baud.
>
>    I've looked at the code and it appears that one can still specify a baud
> rate after ':' even in the "stdout-path" prop.

That's correct. I believe that support was added later.
Can you please send a patch?

Spaciba!

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.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
--
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 v2 12/13] ARM: shmobile: alt dts: Add chosen/stdout-path

[Sergei Shtylyov]

Hello.

On 01/31/2015 01:18 PM, Geert Uytterhoeven wrote:

>>> Add a stdout-path property so that automatic console selection works
>>> in the absence of a "console=" parameter on the kernel command line.

>>> Note that we have to keep the "console=ttySC0,38400" parameter in
>>> chosen/bootargs, else the console will use the default setting of 115200
>>> baud.

>>     I've looked at the code and it appears that one can still specify a baud
>> rate after ':' even in the "stdout-path" prop.

> That's correct. I believe that support was added later.
> Can you please send a patch?

    Looks like Simon wants all boards to work at 115200 which is the default.

> Spaciba!

    Heh, actually it's "sbasibo". :-)

> Gr{oetje,eeting}s,

>                          Geert

WBR, Sergei

Re: [PATCH v2 12/13] ARM: shmobile: alt dts: Add chosen/stdout-path

[Simon Horman]

On Tue, Feb 03, 2015 at 01:13:12AM +0300, Sergei Shtylyov wrote:
> Hello.
> 
> On 01/31/2015 01:18 PM, Geert Uytterhoeven wrote:
> 
> >>>Add a stdout-path property so that automatic console selection works
> >>>in the absence of a "console=" parameter on the kernel command line.
> 
> >>>Note that we have to keep the "console=ttySC0,38400" parameter in
> >>>chosen/bootargs, else the console will use the default setting of 115200
> >>>baud.
> 
> >>    I've looked at the code and it appears that one can still specify a baud
> >>rate after ':' even in the "stdout-path" prop.
> 
> >That's correct. I believe that support was added later.
> >Can you please send a patch?
> 
>    Looks like Simon wants all boards to work at 115200 which is the default.

To be clear: yes that is what I want.

> >Spaciba!
> 
>    Heh, actually it's "sbasibo". :-)
> 
> >Gr{oetje,eeting}s,
> 
> >                         Geert
> 
> WBR, Sergei
> 

[PATCH v2 13/13] ARM: shmobile: kzm9g-reference dts: Add chosen/stdout-path

[Geert Uytterhoeven]

Add a stdout-path property so that automatic console selection works
in the absence of a "console=" parameter on the kernel command line.
In addition, this will allow the PM domain code to find the PM domain
for the console device.

Note that we have to keep the "console=ttySC4" parameter in
chosen/bootargs, else we only get console messages on tty0.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - No changes
---
 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
index 30ef97e99dc53ea7..0dac0e66ccad8f74 100644
--- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
@@ -40,6 +40,7 @@
 
 	chosen {
 		bootargs = "console=tty0 console=ttySC4,115200 root=/dev/nfs ip=dhcp ignore_loglevel rw";
+		stdout-path = &scifa4;
 	};
 
 	memory {
-- 
1.9.1

Re: [PATCH v2 00/13] ARM: shmobile: dts: Add chosen/stdout-path

[Simon Horman]

On Fri, Oct 03, 2014 at 05:11:31PM +0200, Geert Uytterhoeven wrote:
> 	Hi Simon, Magnus,
> 
> This patch series adds chosen/stdout-path to the various shmobile DTS files
> that are used for reference or multi-platform builds.
> 
> This serves two purposes:
>   1. It makes automatic console selection work in the absence of a "console="
>      parameter on the kernel command line, allowing to remove "console="
>      parameters from chosen/bootargs on many platforms.
>      Note that these "console=" parameters are still needed in some cases:
>        a. If console output is wanted on two consoles devices (graphical and
>           serial consoles), like on armadillo and kzm9g,
>        b. When using a non-default baud for the serial console, like on
>           henninger and alt,
>        c. If the DTS is shared between legacy and multi-platform, like on
>           armadillo, koelsch, lager, and marzen,
>   2. It will allow the PM domain code to find the PM domain for the console
>      device, to make "no_console_suspend" work in the DT case.
>      For now, this will matter on armadillo.
> 
> The first two patches are small cleanups for emev2 dtsi, on top of which the
> change for kzm9d is built.
> 
> Changes in v2:
>   - Keep "console" for DTSes shared between legacy and multi-platform,
>   - Update for lager switching the console from scif0 to scifa0.
> 
> Thanks for applying!
> 
> Geert Uytterhoeven (13):
>   ARM: shmobile: emev2 dtsi: Use generic names for device nodes
>   ARM: shmobile: emev2 dtsi: Add uart* labels for easier referencing
>   ARM: shmobile: kzm9d dts: Add chosen/stdout-path
>   ARM: shmobile: genmai dts: Add chosen/stdout-path
>   ARM: shmobile: ape6evm-reference dts: Add chosen/stdout-path
>   ARM: shmobile: armadillo800eva dts: Add chosen/stdout-path
>   ARM: shmobile: bockw-reference dts: Add chosen/stdout-path
>   ARM: shmobile: marzen dts: Add chosen/stdout-path
>   ARM: shmobile: lager dts: Add chosen/stdout-path
>   ARM: shmobile: henninger dts: Add chosen/stdout-path
>   ARM: shmobile: koelsch dts: Add chosen/stdout-path
>   ARM: shmobile: alt dts: Add chosen/stdout-path
>   ARM: shmobile: kzm9g-reference dts: Add chosen/stdout-path

I have not queued-up the kzm9d patch which I have commented on in
a reply to it.

I have queued up all the other patches for v3.19.

> 
>  arch/arm/boot/dts/emev2-kzm9d.dts               |  3 ++-
>  arch/arm/boot/dts/emev2.dtsi                    | 12 ++++++------
>  arch/arm/boot/dts/r7s72100-genmai.dts           |  3 ++-
>  arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts |  3 ++-
>  arch/arm/boot/dts/r8a7740-armadillo800eva.dts   |  1 +
>  arch/arm/boot/dts/r8a7778-bockw-reference.dts   |  3 ++-
>  arch/arm/boot/dts/r8a7779-marzen.dts            |  1 +
>  arch/arm/boot/dts/r8a7790-lager.dts             |  1 +
>  arch/arm/boot/dts/r8a7791-henninger.dts         |  1 +
>  arch/arm/boot/dts/r8a7791-koelsch.dts           |  1 +
>  arch/arm/boot/dts/r8a7794-alt.dts               |  1 +
>  arch/arm/boot/dts/sh73a0-kzm9g-reference.dts    |  1 +
>  12 files changed, 21 insertions(+), 10 deletions(-)
> 
> -- 
> 1.9.1
> 
> 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
>