devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 00/13] ARM: shmobile: dts: Add chosen/stdout-path
@ 2014-09-25 16:13 Geert Uytterhoeven
  2014-09-25 16:13 ` [PATCH 02/13] ARM: shmobile: emev2 dtsi: Add uart* labels for easier referencing Geert Uytterhoeven
                   ` (10 more replies)
  0 siblings, 11 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2014-09-25 16:13 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm; +Cc: linux-sh, devicetree, 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,
  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.

Thanks!

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            |  3 ++-
 arch/arm/boot/dts/r8a7790-lager.dts             |  3 ++-
 arch/arm/boot/dts/r8a7791-henninger.dts         |  1 +
 arch/arm/boot/dts/r8a7791-koelsch.dts           |  3 ++-
 arch/arm/boot/dts/r8a7794-alt.dts               |  1 +
 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts    |  1 +
 12 files changed, 24 insertions(+), 13 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

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [PATCH 01/13] ARM: shmobile: emev2 dtsi: Use generic names for device nodes
       [not found] ` <1411661609-4280-1-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
@ 2014-09-25 16:13   ` Geert Uytterhoeven
  2014-09-25 16:13   ` [PATCH 03/13] ARM: shmobile: kzm9d dts: Add chosen/stdout-path Geert Uytterhoeven
                     ` (2 subsequent siblings)
  3 siblings, 0 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2014-09-25 16:13 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm
  Cc: linux-sh-u79uwXL29TY76Z2rM5mHXA,
	devicetree-u79uwXL29TY76Z2rM5mHXA, 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>
---
 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

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 02/13] ARM: shmobile: emev2 dtsi: Add uart* labels for easier referencing
  2014-09-25 16:13 [PATCH 00/13] ARM: shmobile: dts: Add chosen/stdout-path Geert Uytterhoeven
@ 2014-09-25 16:13 ` Geert Uytterhoeven
  2014-09-25 16:13 ` [PATCH 04/13] ARM: shmobile: genmai dts: Add chosen/stdout-path Geert Uytterhoeven
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2014-09-25 16:13 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm; +Cc: linux-sh, devicetree, Geert Uytterhoeven

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 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


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 03/13] ARM: shmobile: kzm9d dts: Add chosen/stdout-path
       [not found] ` <1411661609-4280-1-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
  2014-09-25 16:13   ` [PATCH 01/13] ARM: shmobile: emev2 dtsi: Use generic names for device nodes Geert Uytterhoeven
@ 2014-09-25 16:13   ` Geert Uytterhoeven
  2014-09-25 16:13   ` [PATCH 05/13] ARM: shmobile: ape6evm-reference " Geert Uytterhoeven
  2014-09-25 16:13   ` [PATCH 12/13] ARM: shmobile: alt " Geert Uytterhoeven
  3 siblings, 0 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2014-09-25 16:13 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm
  Cc: linux-sh-u79uwXL29TY76Z2rM5mHXA,
	devicetree-u79uwXL29TY76Z2rM5mHXA, 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-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
---
 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 50ccd151091e23d3..afd369f9262288a1 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;
 	};
 
 	reg_1p8v: regulator@0 {
-- 
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

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 04/13] ARM: shmobile: genmai dts: Add chosen/stdout-path
  2014-09-25 16:13 [PATCH 00/13] ARM: shmobile: dts: Add chosen/stdout-path Geert Uytterhoeven
  2014-09-25 16:13 ` [PATCH 02/13] ARM: shmobile: emev2 dtsi: Add uart* labels for easier referencing Geert Uytterhoeven
@ 2014-09-25 16:13 ` Geert Uytterhoeven
       [not found] ` <1411661609-4280-1-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2014-09-25 16:13 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm; +Cc: linux-sh, devicetree, 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>
---
 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


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 05/13] ARM: shmobile: ape6evm-reference dts: Add chosen/stdout-path
       [not found] ` <1411661609-4280-1-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
  2014-09-25 16:13   ` [PATCH 01/13] ARM: shmobile: emev2 dtsi: Use generic names for device nodes Geert Uytterhoeven
  2014-09-25 16:13   ` [PATCH 03/13] ARM: shmobile: kzm9d dts: Add chosen/stdout-path Geert Uytterhoeven
@ 2014-09-25 16:13   ` Geert Uytterhoeven
  2014-09-25 16:13   ` [PATCH 12/13] ARM: shmobile: alt " Geert Uytterhoeven
  3 siblings, 0 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2014-09-25 16:13 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm
  Cc: linux-sh-u79uwXL29TY76Z2rM5mHXA,
	devicetree-u79uwXL29TY76Z2rM5mHXA, 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-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
---
 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

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

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 06/13] ARM: shmobile: armadillo800eva dts: Add chosen/stdout-path
  2014-09-25 16:13 [PATCH 00/13] ARM: shmobile: dts: Add chosen/stdout-path Geert Uytterhoeven
                   ` (2 preceding siblings ...)
       [not found] ` <1411661609-4280-1-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
@ 2014-09-25 16:13 ` Geert Uytterhoeven
  2014-09-25 16:13 ` [PATCH 07/13] ARM: shmobile: bockw-reference " Geert Uytterhoeven
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2014-09-25 16:13 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm; +Cc: linux-sh, devicetree, 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.

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


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 07/13] ARM: shmobile: bockw-reference dts: Add chosen/stdout-path
  2014-09-25 16:13 [PATCH 00/13] ARM: shmobile: dts: Add chosen/stdout-path Geert Uytterhoeven
                   ` (3 preceding siblings ...)
  2014-09-25 16:13 ` [PATCH 06/13] ARM: shmobile: armadillo800eva " Geert Uytterhoeven
@ 2014-09-25 16:13 ` Geert Uytterhoeven
  2014-09-25 16:13 ` [PATCH 08/13] ARM: shmobile: marzen " Geert Uytterhoeven
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2014-09-25 16:13 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm; +Cc: linux-sh, devicetree, 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>
---
 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


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 08/13] ARM: shmobile: marzen dts: Add chosen/stdout-path
  2014-09-25 16:13 [PATCH 00/13] ARM: shmobile: dts: Add chosen/stdout-path Geert Uytterhoeven
                   ` (4 preceding siblings ...)
  2014-09-25 16:13 ` [PATCH 07/13] ARM: shmobile: bockw-reference " Geert Uytterhoeven
@ 2014-09-25 16:13 ` Geert Uytterhoeven
  2014-09-25 16:13 ` [PATCH 09/13] ARM: shmobile: lager " Geert Uytterhoeven
                   ` (4 subsequent siblings)
  10 siblings, 0 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2014-09-25 16:13 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm; +Cc: linux-sh, devicetree, 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>
---
 arch/arm/boot/dts/r8a7779-marzen.dts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 09/13] ARM: shmobile: lager dts: Add chosen/stdout-path
  2014-09-25 16:13 [PATCH 00/13] ARM: shmobile: dts: Add chosen/stdout-path Geert Uytterhoeven
                   ` (5 preceding siblings ...)
  2014-09-25 16:13 ` [PATCH 08/13] ARM: shmobile: marzen " Geert Uytterhoeven
@ 2014-09-25 16:13 ` Geert Uytterhoeven
  2014-09-25 16:13 ` [PATCH 10/13] ARM: shmobile: henninger " Geert Uytterhoeven
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2014-09-25 16:13 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm; +Cc: linux-sh, devicetree, 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>
---
 arch/arm/boot/dts/r8a7790-lager.dts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 84dcafa7179bf04d..cba084b0a8806151 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -24,7 +24,8 @@
 	};
 
 	chosen {
-		bootargs = "console=ttySC6,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
+		bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
+		stdout-path = &scif0;
 	};
 
 	memory@40000000 {
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 10/13] ARM: shmobile: henninger dts: Add chosen/stdout-path
  2014-09-25 16:13 [PATCH 00/13] ARM: shmobile: dts: Add chosen/stdout-path Geert Uytterhoeven
                   ` (6 preceding siblings ...)
  2014-09-25 16:13 ` [PATCH 09/13] ARM: shmobile: lager " Geert Uytterhoeven
@ 2014-09-25 16:13 ` Geert Uytterhoeven
  2014-09-25 16:13 ` [PATCH 11/13] ARM: shmobile: koelsch " Geert Uytterhoeven
                   ` (2 subsequent siblings)
  10 siblings, 0 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2014-09-25 16:13 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm; +Cc: linux-sh, devicetree, 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>
---
 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 f1b56de10205f14b..0868899882e3347c 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


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 11/13] ARM: shmobile: koelsch dts: Add chosen/stdout-path
  2014-09-25 16:13 [PATCH 00/13] ARM: shmobile: dts: Add chosen/stdout-path Geert Uytterhoeven
                   ` (7 preceding siblings ...)
  2014-09-25 16:13 ` [PATCH 10/13] ARM: shmobile: henninger " Geert Uytterhoeven
@ 2014-09-25 16:13 ` Geert Uytterhoeven
  2014-09-25 16:13 ` [PATCH 13/13] ARM: shmobile: kzm9g-reference " Geert Uytterhoeven
  2014-09-30  2:07 ` [PATCH 00/13] ARM: shmobile: " Simon Horman
  10 siblings, 0 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2014-09-25 16:13 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm; +Cc: linux-sh, devicetree, 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>
---
 arch/arm/boot/dts/r8a7791-koelsch.dts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index 51807a3795d9b5b8..a33e8eaa7008da51 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -25,7 +25,8 @@
 	};
 
 	chosen {
-		bootargs = "console=ttySC6,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
+		bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
+		stdout-path = &scif0;
 	};
 
 	memory@40000000 {
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 12/13] ARM: shmobile: alt dts: Add chosen/stdout-path
       [not found] ` <1411661609-4280-1-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
                     ` (2 preceding siblings ...)
  2014-09-25 16:13   ` [PATCH 05/13] ARM: shmobile: ape6evm-reference " Geert Uytterhoeven
@ 2014-09-25 16:13   ` Geert Uytterhoeven
  3 siblings, 0 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2014-09-25 16:13 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm
  Cc: linux-sh-u79uwXL29TY76Z2rM5mHXA,
	devicetree-u79uwXL29TY76Z2rM5mHXA, 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-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
---
 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

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

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 13/13] ARM: shmobile: kzm9g-reference dts: Add chosen/stdout-path
  2014-09-25 16:13 [PATCH 00/13] ARM: shmobile: dts: Add chosen/stdout-path Geert Uytterhoeven
                   ` (8 preceding siblings ...)
  2014-09-25 16:13 ` [PATCH 11/13] ARM: shmobile: koelsch " Geert Uytterhoeven
@ 2014-09-25 16:13 ` Geert Uytterhoeven
  2014-09-30  2:07 ` [PATCH 00/13] ARM: shmobile: " Simon Horman
  10 siblings, 0 replies; 18+ messages in thread
From: Geert Uytterhoeven @ 2014-09-25 16:13 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm; +Cc: linux-sh, devicetree, 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>
---
 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


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* Re: [PATCH 00/13] ARM: shmobile: dts: Add chosen/stdout-path
  2014-09-25 16:13 [PATCH 00/13] ARM: shmobile: dts: Add chosen/stdout-path Geert Uytterhoeven
                   ` (9 preceding siblings ...)
  2014-09-25 16:13 ` [PATCH 13/13] ARM: shmobile: kzm9g-reference " Geert Uytterhoeven
@ 2014-09-30  2:07 ` Simon Horman
  2014-09-30  6:30   ` Simon Horman
  10 siblings, 1 reply; 18+ messages in thread
From: Simon Horman @ 2014-09-30  2:07 UTC (permalink / raw)
  To: Geert Uytterhoeven; +Cc: Magnus Damm, linux-sh, devicetree

On Thu, Sep 25, 2014 at 06:13:16PM +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,
>   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.

Thanks, I have queued these up for v3.19.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 00/13] ARM: shmobile: dts: Add chosen/stdout-path
  2014-09-30  2:07 ` [PATCH 00/13] ARM: shmobile: " Simon Horman
@ 2014-09-30  6:30   ` Simon Horman
  2014-09-30  7:04     ` Geert Uytterhoeven
  0 siblings, 1 reply; 18+ messages in thread
From: Simon Horman @ 2014-09-30  6:30 UTC (permalink / raw)
  To: Geert Uytterhoeven; +Cc: Magnus Damm, linux-sh, devicetree

On Tue, Sep 30, 2014 at 11:07:56AM +0900, Simon Horman wrote:
> On Thu, Sep 25, 2014 at 06:13:16PM +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,
> >   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.
> 
> Thanks, I have queued these up for v3.19.

I spoke a little too soon.

While testing these patches I noticed that the koelsch patch
cases there to be no kernel output to the console (during boot)
when booting using legacy C.

I assume that this is due to removing
console=ttySC6,115200 from bootargs.

I also assume this affects all boards that can still
be booted using legacy C.

I have dropped this series for now.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 00/13] ARM: shmobile: dts: Add chosen/stdout-path
  2014-09-30  6:30   ` Simon Horman
@ 2014-09-30  7:04     ` Geert Uytterhoeven
  2014-09-30  8:05       ` Simon Horman
  0 siblings, 1 reply; 18+ messages in thread
From: Geert Uytterhoeven @ 2014-09-30  7:04 UTC (permalink / raw)
  To: Simon Horman
  Cc: Geert Uytterhoeven, Magnus Damm, Linux-sh list,
	devicetree@vger.kernel.org

Hi Simon,

On Tue, Sep 30, 2014 at 8:30 AM, Simon Horman <horms@verge.net.au> wrote:
> On Tue, Sep 30, 2014 at 11:07:56AM +0900, Simon Horman wrote:
>> On Thu, Sep 25, 2014 at 06:13:16PM +0200, Geert Uytterhoeven wrote:
>> > 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,
>> >   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.
>>
>> Thanks, I have queued these up for v3.19.
>
> I spoke a little too soon.
>
> While testing these patches I noticed that the koelsch patch
> cases there to be no kernel output to the console (during boot)
> when booting using legacy C.
>
> I assume that this is due to removing
> console=ttySC6,115200 from bootargs.

Sorry, in my mind koelsch legacy is already gone ;-)

> I also assume this affects all boards that can still
> be booted using legacy C.

Only the ones where the DTS is shared between legacy and
reference/multi-platform.
Armadillo is not affected, as the console parameters are kept to have
output on both graphical and serial console.
So that leaves us with lager and koelsch only.

> I have dropped this series for now.

Do you want me to resend with the console= parameter kept for koelsch
and lager?
Or should we delay this whole series until koelsch and lager legacy
have been dropped?
IIUC, this is going to happen soon for koelsch, but not for lager?

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

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 00/13] ARM: shmobile: dts: Add chosen/stdout-path
  2014-09-30  7:04     ` Geert Uytterhoeven
@ 2014-09-30  8:05       ` Simon Horman
  0 siblings, 0 replies; 18+ messages in thread
From: Simon Horman @ 2014-09-30  8:05 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Geert Uytterhoeven, Magnus Damm, Linux-sh list,
	devicetree@vger.kernel.org

On Tue, Sep 30, 2014 at 09:04:16AM +0200, Geert Uytterhoeven wrote:
> Hi Simon,
> 
> On Tue, Sep 30, 2014 at 8:30 AM, Simon Horman <horms@verge.net.au> wrote:
> > On Tue, Sep 30, 2014 at 11:07:56AM +0900, Simon Horman wrote:
> >> On Thu, Sep 25, 2014 at 06:13:16PM +0200, Geert Uytterhoeven wrote:
> >> > 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,
> >> >   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.
> >>
> >> Thanks, I have queued these up for v3.19.
> >
> > I spoke a little too soon.
> >
> > While testing these patches I noticed that the koelsch patch
> > cases there to be no kernel output to the console (during boot)
> > when booting using legacy C.
> >
> > I assume that this is due to removing
> > console=ttySC6,115200 from bootargs.
> 
> Sorry, in my mind koelsch legacy is already gone ;-)
> 
> > I also assume this affects all boards that can still
> > be booted using legacy C.
> 
> Only the ones where the DTS is shared between legacy and
> reference/multi-platform.
> Armadillo is not affected, as the console parameters are kept to have
> output on both graphical and serial console.
> So that leaves us with lager and koelsch only.
> 
> > I have dropped this series for now.
> 
> Do you want me to resend with the console= parameter kept for koelsch
> and lager?
> Or should we delay this whole series until koelsch and lager legacy
> have been dropped?

I think it would be best if you reposted the series.

> IIUC, this is going to happen soon for koelsch, but not for lager?

Yes, that is my understanding too.

^ permalink raw reply	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2014-09-30  8:05 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-25 16:13 [PATCH 00/13] ARM: shmobile: dts: Add chosen/stdout-path Geert Uytterhoeven
2014-09-25 16:13 ` [PATCH 02/13] ARM: shmobile: emev2 dtsi: Add uart* labels for easier referencing Geert Uytterhoeven
2014-09-25 16:13 ` [PATCH 04/13] ARM: shmobile: genmai dts: Add chosen/stdout-path Geert Uytterhoeven
     [not found] ` <1411661609-4280-1-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
2014-09-25 16:13   ` [PATCH 01/13] ARM: shmobile: emev2 dtsi: Use generic names for device nodes Geert Uytterhoeven
2014-09-25 16:13   ` [PATCH 03/13] ARM: shmobile: kzm9d dts: Add chosen/stdout-path Geert Uytterhoeven
2014-09-25 16:13   ` [PATCH 05/13] ARM: shmobile: ape6evm-reference " Geert Uytterhoeven
2014-09-25 16:13   ` [PATCH 12/13] ARM: shmobile: alt " Geert Uytterhoeven
2014-09-25 16:13 ` [PATCH 06/13] ARM: shmobile: armadillo800eva " Geert Uytterhoeven
2014-09-25 16:13 ` [PATCH 07/13] ARM: shmobile: bockw-reference " Geert Uytterhoeven
2014-09-25 16:13 ` [PATCH 08/13] ARM: shmobile: marzen " Geert Uytterhoeven
2014-09-25 16:13 ` [PATCH 09/13] ARM: shmobile: lager " Geert Uytterhoeven
2014-09-25 16:13 ` [PATCH 10/13] ARM: shmobile: henninger " Geert Uytterhoeven
2014-09-25 16:13 ` [PATCH 11/13] ARM: shmobile: koelsch " Geert Uytterhoeven
2014-09-25 16:13 ` [PATCH 13/13] ARM: shmobile: kzm9g-reference " Geert Uytterhoeven
2014-09-30  2:07 ` [PATCH 00/13] ARM: shmobile: " Simon Horman
2014-09-30  6:30   ` Simon Horman
2014-09-30  7:04     ` Geert Uytterhoeven
2014-09-30  8:05       ` Simon Horman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).