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.

Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Acked-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts
index 40b88051ea3e4dfbdd6e0b30e5bffc9e677e71bd..c970bf65c74cda431bb0ff0666f358767adb6dbe 100644 (file)
--- a/arch/arm/boot/dts/tegra114-dalmore.dts
+++ b/arch/arm/boot/dts/tegra114-dalmore.dts
@@ -18,6 +18,10 @@ aliases {
                serial0 = &uartd;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        memory {
                reg = <0x80000000 0x40000000>;
        };

diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
index 95b580a9369b20daef36daf983da04e57e8fbf95..a99f07ad6312d62682fe0893acaaaf57f6e6bcc2 100644 (file)
--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
@@ -19,6 +19,10 @@ aliases {
                serial2 = &uartb;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        memory {
                reg = <0x0 0x80000000 0x0 0x80000000>;
        };

diff --git a/arch/arm/boot/dts/tegra124-nyan.dtsi b/arch/arm/boot/dts/tegra124-nyan.dtsi
index c8495eb41fdda1fe520c02a6ec617933ccd716cd..5f1fc1410bd0dc4461caff4f7ff976cc81f8e22a 100644 (file)
--- a/arch/arm/boot/dts/tegra124-nyan.dtsi
+++ b/arch/arm/boot/dts/tegra124-nyan.dtsi
@@ -8,6 +8,10 @@ aliases {
                serial0 = &uarta;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        memory {
                reg = <0x0 0x80000000 0x0 0x80000000>;
        };

diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts
index 4a5f23c5d893829f399d54464ec916c4a2b9652d..0318258dde3e098c788bcf4fc7cfca9b08914f21 100644 (file)
--- a/arch/arm/boot/dts/tegra124-venice2.dts
+++ b/arch/arm/boot/dts/tegra124-venice2.dts
@@ -13,6 +13,10 @@ aliases {
                serial0 = &uarta;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        memory {
                reg = <0x0 0x80000000 0x0 0x80000000>;
        };

diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
index 679f9c49e9f43cd01634f9727ede63d0dda438b8..d2e960cbc0014eff07b08a4a6d7a16a4098d85e4 100644 (file)
--- a/arch/arm/boot/dts/tegra20-harmony.dts
+++ b/arch/arm/boot/dts/tegra20-harmony.dts
@@ -13,6 +13,10 @@ aliases {
                serial0 = &uartd;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        memory {
                reg = <0x00000000 0x40000000>;
        };

diff --git a/arch/arm/boot/dts/tegra20-iris-512.dts b/arch/arm/boot/dts/tegra20-iris-512.dts
index 1dd7d7bfdfcc25e3d3fcb35e6f17c4ccb95b2b5f..bb56dfe9e10c161c1ad3551c6e21d9bf822fd696 100644 (file)
--- a/arch/arm/boot/dts/tegra20-iris-512.dts
+++ b/arch/arm/boot/dts/tegra20-iris-512.dts
@@ -11,6 +11,10 @@ aliases {
                serial1 = &uartd;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        host1x@50000000 {
                hdmi@54280000 {
                        status = "okay";

diff --git a/arch/arm/boot/dts/tegra20-medcom-wide.dts b/arch/arm/boot/dts/tegra20-medcom-wide.dts
index 9b87526ab0b70fad25125a4f5764d418243aa50c..34c6588e92ef830cfe025608142269addcaab89d 100644 (file)
--- a/arch/arm/boot/dts/tegra20-medcom-wide.dts
+++ b/arch/arm/boot/dts/tegra20-medcom-wide.dts
@@ -10,6 +10,10 @@ aliases {
                serial0 = &uartd;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        pwm@7000a000 {
                status = "okay";
        };

diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts
index fce397e3e2ce43a23859f953a8080d628a88da2a..33ed2b23026ba5bf39f9e1e5a7c5e8e7326966d7 100644 (file)
--- a/arch/arm/boot/dts/tegra20-paz00.dts
+++ b/arch/arm/boot/dts/tegra20-paz00.dts
@@ -14,6 +14,10 @@ aliases {
                serial1 = &uartc;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        memory {
                reg = <0x00000000 0x20000000>;
        };

diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts
index a112a415ecd588222150a59bb8fc7463f7bfa1a3..94b60a710dd8d7bbeaa7ef422f1b66b3dcd195a9 100644 (file)
--- a/arch/arm/boot/dts/tegra20-seaboard.dts
+++ b/arch/arm/boot/dts/tegra20-seaboard.dts
@@ -13,6 +13,10 @@ aliases {
                serial0 = &uartd;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        memory {
                reg = <0x00000000 0x40000000>;
        };

diff --git a/arch/arm/boot/dts/tegra20-tamonten.dtsi b/arch/arm/boot/dts/tegra20-tamonten.dtsi
index 13d4e6185275f43c3f74fbeb0397d97b0348f9fb..025e9e8037da25966108d2d1dfb7e235f86bff20 100644 (file)
--- a/arch/arm/boot/dts/tegra20-tamonten.dtsi
+++ b/arch/arm/boot/dts/tegra20-tamonten.dtsi
@@ -10,6 +10,10 @@ aliases {
                serial0 = &uartd;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        memory {
                reg = <0x00000000 0x20000000>;
        };

diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
index a4aaff326f994e572ab6b456e88609aad10f81f8..4a035f74043a0d93c5d3701e27cd28846034351c 100644 (file)
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -13,6 +13,10 @@ aliases {
                serial0 = &uarta;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        memory {
                reg = <0x00000000 0x40000000>;
        };

diff --git a/arch/arm/boot/dts/tegra20-ventana.dts b/arch/arm/boot/dts/tegra20-ventana.dts
index b205935a1236310051cd2c0460047b8a955a6397..a28c060a839bbb95b573cbac8f32be839a454966 100644 (file)
--- a/arch/arm/boot/dts/tegra20-ventana.dts
+++ b/arch/arm/boot/dts/tegra20-ventana.dts
@@ -13,6 +13,10 @@ aliases {
                serial0 = &uartd;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        memory {
                reg = <0x00000000 0x40000000>;
        };

diff --git a/arch/arm/boot/dts/tegra20-whistler.dts b/arch/arm/boot/dts/tegra20-whistler.dts
index 5564d6e975d8e4e37a70e763bba67c8c95f45c99..073806d07b2bc4efa4da7fd3a1d13a0229161175 100644 (file)
--- a/arch/arm/boot/dts/tegra20-whistler.dts
+++ b/arch/arm/boot/dts/tegra20-whistler.dts
@@ -13,6 +13,10 @@ aliases {
                serial0 = &uarta;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        memory {
                reg = <0x00000000 0x20000000>;
        };

diff --git a/arch/arm/boot/dts/tegra30-apalis-eval.dts b/arch/arm/boot/dts/tegra30-apalis-eval.dts
index 3ca3b4c6975b829f105efae2c7640bc8b478ef9c..99a69457dbf5006d2dcfca8d4b4621c70d16c313 100644 (file)
--- a/arch/arm/boot/dts/tegra30-apalis-eval.dts
+++ b/arch/arm/boot/dts/tegra30-apalis-eval.dts
@@ -17,6 +17,10 @@ aliases {
                serial3 = &uartd;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        pcie-controller@00003000 {
                status = "okay";
 

diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts
index 3dede39344461a26043a93c12914c32d962e4f64..1eca3b28ac6480e8b1d628cfebfb2c58ebd24280 100644 (file)
--- a/arch/arm/boot/dts/tegra30-beaver.dts
+++ b/arch/arm/boot/dts/tegra30-beaver.dts
@@ -12,6 +12,10 @@ aliases {
                serial0 = &uarta;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        memory {
                reg = <0x80000000 0x7ff00000>;
        };

diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
index 1714e755c3dec1d116d511aa022530197defc51c..4721c1c9c780588f52b9a607b39fd902880d4a88 100644 (file)
--- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -35,6 +35,10 @@ aliases {
                serial1 = &uartc;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        memory {
                reg = <0x80000000 0x40000000>;
        };

diff --git a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
index 72c79ac9a72fe3f8cc0de8fd938946dedf167aad..76875c3160fea918649013172fcc03d10acb2846 100644 (file)
--- a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
@@ -15,6 +15,10 @@ aliases {
                serial2 = &uartd;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        host1x@50000000 {
                dc@54200000 {
                        rgb {