ARM: tegra: Add stdout-path for various boards
Subsystems (2)
PATCH 1/2 ARM: tegra: Add stdout-path for various boards
For Tegra boards, the device-tree alias serial0 is used for the console and so add the stdout-path information so that the console no longer needs to be passed via the kernel boot parameters.
This has been tested on boards, tegra20-trimslice, tegra30-beaver, tegra114-dalmore and tegra124-jetson-tk1.
---
The only boards that I have not modified are tegra114-roth and tegra114-tn7 because these boards have two entries for console in the *.dts file. AFAICT we cannot suppport multiple consoles via the stdout-path and if a console is specified by the kernel boot parameters then this sets the kernel variable "console_set_on_cmdline" and prevents the stdout-path console being registered. If there is a better way to handle these boards via device-tree let me know.
arch/arm/boot/dts/tegra114-dalmore.dts | 4 ++++ arch/arm/boot/dts/tegra124-jetson-tk1.dts | 4 ++++ arch/arm/boot/dts/tegra124-nyan.dtsi | 4 ++++ arch/arm/boot/dts/tegra124-venice2.dts | 4 ++++ arch/arm/boot/dts/tegra20-harmony.dts | 4 ++++ arch/arm/boot/dts/tegra20-iris-512.dts | 4 ++++ arch/arm/boot/dts/tegra20-medcom-wide.dts | 4 ++++ arch/arm/boot/dts/tegra20-paz00.dts | 4 ++++ arch/arm/boot/dts/tegra20-seaboard.dts | 4 ++++ arch/arm/boot/dts/tegra20-tamonten.dtsi | 4 ++++ arch/arm/boot/dts/tegra20-trimslice.dts | 4 ++++ arch/arm/boot/dts/tegra20-ventana.dts | 4 ++++ arch/arm/boot/dts/tegra20-whistler.dts | 4 ++++ arch/arm/boot/dts/tegra30-apalis-eval.dts | 4 ++++ arch/arm/boot/dts/tegra30-beaver.dts | 4 ++++ arch/arm/boot/dts/tegra30-cardhu.dtsi | 4 ++++ arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 4 ++++ 17 files changed, 68 insertions(+)
arch/arm/boot/dts/tegra114-dalmore.dts +4 -0
@@ -18,6 +18,10 @@ serial0 = &uartd; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x80000000 0x40000000>; };
arch/arm/boot/dts/tegra124-jetson-tk1.dts +4 -0
@@ -19,6 +19,10 @@ serial2 = &uartb; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x0 0x80000000 0x0 0x80000000>; };
arch/arm/boot/dts/tegra124-nyan.dtsi +4 -0
@@ -8,6 +8,10 @@ serial0 = &uarta; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x0 0x80000000 0x0 0x80000000>; };
arch/arm/boot/dts/tegra124-venice2.dts +4 -0
@@ -13,6 +13,10 @@ serial0 = &uarta; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x0 0x80000000 0x0 0x80000000>; };
arch/arm/boot/dts/tegra20-harmony.dts +4 -0
@@ -13,6 +13,10 @@ serial0 = &uartd; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x00000000 0x40000000>; };
arch/arm/boot/dts/tegra20-iris-512.dts +4 -0
@@ -11,6 +11,10 @@ serial1 = &uartd; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + host1x@50000000 { hdmi@54280000 { status = "okay";
arch/arm/boot/dts/tegra20-medcom-wide.dts +4 -0
@@ -10,6 +10,10 @@ serial0 = &uartd; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + pwm@7000a000 { status = "okay"; };
arch/arm/boot/dts/tegra20-paz00.dts +4 -0
@@ -14,6 +14,10 @@ serial1 = &uartc; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x00000000 0x20000000>; };
arch/arm/boot/dts/tegra20-seaboard.dts +4 -0
@@ -13,6 +13,10 @@ serial0 = &uartd; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x00000000 0x40000000>; };
arch/arm/boot/dts/tegra20-tamonten.dtsi +4 -0
@@ -10,6 +10,10 @@ serial0 = &uartd; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x00000000 0x20000000>; };
arch/arm/boot/dts/tegra20-trimslice.dts +4 -0
@@ -13,6 +13,10 @@ serial0 = &uarta; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x00000000 0x40000000>; };
arch/arm/boot/dts/tegra20-ventana.dts +4 -0
@@ -13,6 +13,10 @@ serial0 = &uartd; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x00000000 0x40000000>; };
arch/arm/boot/dts/tegra20-whistler.dts +4 -0
@@ -13,6 +13,10 @@ serial0 = &uarta; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x00000000 0x20000000>; };
arch/arm/boot/dts/tegra30-apalis-eval.dts +4 -0
@@ -17,6 +17,10 @@ serial3 = &uartd; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + pcie-controller@00003000 { status = "okay";
arch/arm/boot/dts/tegra30-beaver.dts +4 -0
@@ -12,6 +12,10 @@ serial0 = &uarta; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x80000000 0x7ff00000>; };
arch/arm/boot/dts/tegra30-cardhu.dtsi +4 -0
@@ -35,6 +35,10 @@ serial1 = &uartc; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x80000000 0x40000000>; };
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +4 -0
@@ -15,6 +15,10 @@ serial2 = &uartd; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + host1x@50000000 { dc@54200000 { rgb {
Signature · 1 line
2.1.4
A message that is not in the archive (sent off-list or not yet received): 1455025920-21875-1-git-send-email-jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org
PATCH 2/2 ARM64: tegra: Add stdout-path for various boards
For Tegra boards, the device-tree alias serial0 is used for the console and so add the stdout-path information so that the console no longer needs to be passed via the kernel boot parameters.
For tegra132-norrin the alias serial0 is not defined and so add this.
This has been tested on tegra132-norrin and tegra210-p2371-0000.
--- arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 5 ++++- arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/nvidia/tegra132-norrin.dts +4 -1
@@ -10,9 +10,12 @@ aliases { rtc0 = "/i2c@0,7000d000/as3722@40"; rtc1 = "/rtc@0,7000e000"; + serial0 = &uarta; }; - chosen { }; + chosen { + stdout-path = "serial0:115200n8"; + }; memory { device_type = "memory";
arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi +4 -0
@@ -9,6 +9,10 @@ serial0 = &uarta; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { device_type = "memory"; reg = <0x0 0x80000000 0x0 0xc0000000>;
Signature · 1 line
2.1.4
A message that is not in the archive (sent off-list or not yet received): 1455025920-21875-2-git-send-email-jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org
Thierry Reding
AppliedRe: [PATCH 2/2] ARM64: tegra: Add stdout-path for various boards
Quoted 6 lines · Jon Hunter
For Tegra boards, the device-tree alias serial0 is used for the console and so add the stdout-path information so that the console no longer needs to be passed via the kernel boot parameters.
For tegra132-norrin the alias serial0 is not defined and so add this.
Quoted 7 lines
This has been tested on tegra132-norrin and tegra210-p2371-0000.
Signed-off-by Jon Hunter <[email protected]>--- arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 5 ++++- arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-)
Applied, thanks.
Thierry
Stefan Agner
Acked-byQuoted 19 lines · Jon Hunter
For Tegra boards, the device-tree alias serial0 is used for the console and so add the stdout-path information so that the console no longer needs to be passed via the kernel boot parameters.
This has been tested on boards, tegra20-trimslice, tegra30-beaver, tegra114-dalmore and tegra124-jetson-tk1.
Signed-off-by Jon Hunter <[email protected]>---
The only boards that I have not modified are tegra114-roth and tegra114-tn7 because these boards have two entries for console in the *.dts file. AFAICT we cannot suppport multiple consoles via the stdout-path and if a console is specified by the kernel boot parameters then this sets the kernel variable "
console_set_on_cmdline" and prevents the stdout-path console being registered. If there is a better way to handle these boards via device-tree let me know.
Quoted 16 lines
arch/arm/boot/dts/tegra114-dalmore.dts | 4 ++++ arch/arm/boot/dts/tegra124-jetson-tk1.dts | 4 ++++ arch/arm/boot/dts/tegra124-nyan.dtsi | 4 ++++ arch/arm/boot/dts/tegra124-venice2.dts | 4 ++++ arch/arm/boot/dts/tegra20-harmony.dts | 4 ++++ arch/arm/boot/dts/tegra20-iris-512.dts | 4 ++++ arch/arm/boot/dts/tegra20-medcom-wide.dts | 4 ++++ arch/arm/boot/dts/tegra20-paz00.dts | 4 ++++ arch/arm/boot/dts/tegra20-seaboard.dts | 4 ++++ arch/arm/boot/dts/tegra20-tamonten.dtsi | 4 ++++ arch/arm/boot/dts/tegra20-trimslice.dts | 4 ++++ arch/arm/boot/dts/tegra20-ventana.dts | 4 ++++ arch/arm/boot/dts/tegra20-whistler.dts | 4 ++++ arch/arm/boot/dts/tegra30-apalis-eval.dts | 4 ++++ arch/arm/boot/dts/tegra30-beaver.dts | 4 ++++ arch/arm/boot/dts/tegra30-cardhu.dtsi | 4 ++++
For
Quoted 3 lines
arch/arm/boot/dts/tegra30-apalis-eval.dts | 4 ++++ arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 4 ++++ arch/arm/boot/dts/tegra20-iris-512.dts | 4 ++++
--
Stefan
Quoted 10 lines · Jon Hunter
For Tegra boards, the device-tree alias serial0 is used for the console and so add the stdout-path information so that the console no longer needs to be passed via the kernel boot parameters.
This has been tested on boards, tegra20-trimslice, tegra30-beaver, tegra114-dalmore and tegra124-jetson-tk1.
Signed-off-by Jon Hunter <[email protected]>---
Quoted 8 lines
The only boards that I have not modified are tegra114-roth and tegra114-tn7 because these boards have two entries for console in the *.dts file. AFAICT we cannot suppport multiple consoles via the stdout-path and if a console is specified by the kernel boot parameters then this sets the kernel variable "
console_set_on_cmdline" and prevents the stdout-path console being registered. If there is a better way to handle these boards via device-tree let me know.
These two boards require a hardcoded command-line in the DT anyway, since the bootloader's command-line cannot be overridden (due to bad bootloader design). So it seems ok to me to keep specifying the boot console there for them.
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Thierry,
I forgot about these patches. Not urgent, but may be we can queue them for v4.7.
Cheers
Jon
Quoted 294 lines · Jon Hunter
For Tegra boards, the device-tree alias serial0 is used for the console and so add the stdout-path information so that the console no longer needs to be passed via the kernel boot parameters.
This has been tested on boards, tegra20-trimslice, tegra30-beaver, tegra114-dalmore and tegra124-jetson-tk1.
Signed-off-by Jon Hunter <[email protected]>---
The only boards that I have not modified are tegra114-roth and tegra114-tn7 because these boards have two entries for console in the *.dts file. AFAICT we cannot suppport multiple consoles via the stdout-path and if a console is specified by the kernel boot parameters then this sets the kernel variable "
console_set_on_cmdline" and prevents the stdout-path console being registered. If there is a better way to handle these boards via device-tree let me know.arch/arm/boot/dts/tegra114-dalmore.dts | 4 ++++ arch/arm/boot/dts/tegra124-jetson-tk1.dts | 4 ++++ arch/arm/boot/dts/tegra124-nyan.dtsi | 4 ++++ arch/arm/boot/dts/tegra124-venice2.dts | 4 ++++ arch/arm/boot/dts/tegra20-harmony.dts | 4 ++++ arch/arm/boot/dts/tegra20-iris-512.dts | 4 ++++ arch/arm/boot/dts/tegra20-medcom-wide.dts | 4 ++++ arch/arm/boot/dts/tegra20-paz00.dts | 4 ++++ arch/arm/boot/dts/tegra20-seaboard.dts | 4 ++++ arch/arm/boot/dts/tegra20-tamonten.dtsi | 4 ++++ arch/arm/boot/dts/tegra20-trimslice.dts | 4 ++++ arch/arm/boot/dts/tegra20-ventana.dts | 4 ++++ arch/arm/boot/dts/tegra20-whistler.dts | 4 ++++ arch/arm/boot/dts/tegra30-apalis-eval.dts | 4 ++++ arch/arm/boot/dts/tegra30-beaver.dts | 4 ++++ arch/arm/boot/dts/tegra30-cardhu.dtsi | 4 ++++ arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 4 ++++ 17 files changed, 68 insertions(+)arch/arm/boot/dts/tegra114-dalmore.dts +4
-0@@ -18,6 +18,10 @@ serial0 = &uartd; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x80000000 0x40000000>; };arch/arm/boot/dts/tegra124-jetson-tk1.dts +4
-0@@ -19,6 +19,10 @@ serial2 = &uartb; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x0 0x80000000 0x0 0x80000000>; };arch/arm/boot/dts/tegra124-nyan.dtsi +4
-0@@ -8,6 +8,10 @@ serial0 = &uarta; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x0 0x80000000 0x0 0x80000000>; };arch/arm/boot/dts/tegra124-venice2.dts +4
-0@@ -13,6 +13,10 @@ serial0 = &uarta; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x0 0x80000000 0x0 0x80000000>; };arch/arm/boot/dts/tegra20-harmony.dts +4
-0@@ -13,6 +13,10 @@ serial0 = &uartd; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x00000000 0x40000000>; };arch/arm/boot/dts/tegra20-iris-512.dts +4
-0@@ -11,6 +11,10 @@ serial1 = &uartd; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + host1x@50000000 { hdmi@54280000 { status = "okay";arch/arm/boot/dts/tegra20-medcom-wide.dts +4
-0@@ -10,6 +10,10 @@ serial0 = &uartd; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + pwm@7000a000 { status = "okay"; };arch/arm/boot/dts/tegra20-paz00.dts +4
-0@@ -14,6 +14,10 @@ serial1 = &uartc; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x00000000 0x20000000>; };arch/arm/boot/dts/tegra20-seaboard.dts +4
-0@@ -13,6 +13,10 @@ serial0 = &uartd; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x00000000 0x40000000>; };arch/arm/boot/dts/tegra20-tamonten.dtsi +4
-0@@ -10,6 +10,10 @@ serial0 = &uartd; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x00000000 0x20000000>; };arch/arm/boot/dts/tegra20-trimslice.dts +4
-0@@ -13,6 +13,10 @@ serial0 = &uarta; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x00000000 0x40000000>; };arch/arm/boot/dts/tegra20-ventana.dts +4
-0@@ -13,6 +13,10 @@ serial0 = &uartd; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x00000000 0x40000000>; };arch/arm/boot/dts/tegra20-whistler.dts +4
-0@@ -13,6 +13,10 @@ serial0 = &uarta; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x00000000 0x20000000>; };arch/arm/boot/dts/tegra30-apalis-eval.dts +4
-0@@ -17,6 +17,10 @@ serial3 = &uartd; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + pcie-controller@00003000 { status = "okay";arch/arm/boot/dts/tegra30-beaver.dts +4
-0@@ -12,6 +12,10 @@ serial0 = &uarta; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x80000000 0x7ff00000>; };arch/arm/boot/dts/tegra30-cardhu.dtsi +4
-0@@ -35,6 +35,10 @@ serial1 = &uartc; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + memory { reg = <0x80000000 0x40000000>; };arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +4
-0@@ -15,6 +15,10 @@ serial2 = &uartd; }; + chosen { + stdout-path = "serial0:115200n8"; + }; + host1x@50000000 { dc@54200000 { rgb {
Thierry Reding
AppliedQuoted 8 lines · Jon Hunter
For Tegra boards, the device-tree alias serial0 is used for the console and so add the stdout-path information so that the console no longer needs to be passed via the kernel boot parameters.
This has been tested on boards, tegra20-trimslice, tegra30-beaver, tegra114-dalmore and tegra124-jetson-tk1.
Signed-off-by Jon Hunter <[email protected]>
Applied, thanks.
Thierry