aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Hunter <jonathanh@nvidia.com>2016-02-09 08:51:59 -0500
committerThierry Reding <treding@nvidia.com>2016-04-12 11:10:25 -0400
commitf5bbb327a4e896a7f353762068b786852d98187b (patch)
tree3e3444cfada5a188a370b3f575550a0b21882761
parentd1c04d30c3973df6ec0933f21ff8a56028e47ce7 (diff)
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>
Diffstat
-rw-r--r--arch/arm/boot/dts/tegra114-dalmore.dts4
-rw-r--r--arch/arm/boot/dts/tegra124-jetson-tk1.dts4
-rw-r--r--arch/arm/boot/dts/tegra124-nyan.dtsi4
-rw-r--r--arch/arm/boot/dts/tegra124-venice2.dts4
-rw-r--r--arch/arm/boot/dts/tegra20-harmony.dts4
-rw-r--r--arch/arm/boot/dts/tegra20-iris-512.dts4
-rw-r--r--arch/arm/boot/dts/tegra20-medcom-wide.dts4
-rw-r--r--arch/arm/boot/dts/tegra20-paz00.dts4
-rw-r--r--arch/arm/boot/dts/tegra20-seaboard.dts4
-rw-r--r--arch/arm/boot/dts/tegra20-tamonten.dtsi4
-rw-r--r--arch/arm/boot/dts/tegra20-trimslice.dts4
-rw-r--r--arch/arm/boot/dts/tegra20-ventana.dts4
-rw-r--r--arch/arm/boot/dts/tegra20-whistler.dts4
-rw-r--r--arch/arm/boot/dts/tegra30-apalis-eval.dts4
-rw-r--r--arch/arm/boot/dts/tegra30-beaver.dts4
-rw-r--r--arch/arm/boot/dts/tegra30-cardhu.dtsi4
-rw-r--r--arch/arm/boot/dts/tegra30-colibri-eval-v3.dts4
17 files changed, 68 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts
index 40b88051ea3e..c970bf65c74c 100644
--- a/arch/arm/boot/dts/tegra114-dalmore.dts
+++ b/arch/arm/boot/dts/tegra114-dalmore.dts
@@ -18,6 +18,10 @@
18 serial0 = &uartd; 18 serial0 = &uartd;
19 }; 19 };
20 20
21 chosen {
22 stdout-path = "serial0:115200n8";
23 };
24
21 memory { 25 memory {
22 reg = <0x80000000 0x40000000>; 26 reg = <0x80000000 0x40000000>;
23 }; 27 };
diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
index 95b580a9369b..a99f07ad6312 100644
--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
@@ -19,6 +19,10 @@
19 serial2 = &uartb; 19 serial2 = &uartb;
20 }; 20 };
21 21
22 chosen {
23 stdout-path = "serial0:115200n8";
24 };
25
22 memory { 26 memory {
23 reg = <0x0 0x80000000 0x0 0x80000000>; 27 reg = <0x0 0x80000000 0x0 0x80000000>;
24 }; 28 };
diff --git a/arch/arm/boot/dts/tegra124-nyan.dtsi b/arch/arm/boot/dts/tegra124-nyan.dtsi
index c8495eb41fdd..5f1fc1410bd0 100644
--- a/arch/arm/boot/dts/tegra124-nyan.dtsi
+++ b/arch/arm/boot/dts/tegra124-nyan.dtsi
@@ -8,6 +8,10 @@
8 serial0 = &uarta; 8 serial0 = &uarta;
9 }; 9 };
10 10
11 chosen {
12 stdout-path = "serial0:115200n8";
13 };
14
11 memory { 15 memory {
12 reg = <0x0 0x80000000 0x0 0x80000000>; 16 reg = <0x0 0x80000000 0x0 0x80000000>;
13 }; 17 };
diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts
index 4a5f23c5d893..0318258dde3e 100644
--- a/arch/arm/boot/dts/tegra124-venice2.dts
+++ b/arch/arm/boot/dts/tegra124-venice2.dts
@@ -13,6 +13,10 @@
13 serial0 = &uarta; 13 serial0 = &uarta;
14 }; 14 };
15 15
16 chosen {
17 stdout-path = "serial0:115200n8";
18 };
19
16 memory { 20 memory {
17 reg = <0x0 0x80000000 0x0 0x80000000>; 21 reg = <0x0 0x80000000 0x0 0x80000000>;
18 }; 22 };
diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
index 679f9c49e9f4..d2e960cbc001 100644
--- a/arch/arm/boot/dts/tegra20-harmony.dts
+++ b/arch/arm/boot/dts/tegra20-harmony.dts
@@ -13,6 +13,10 @@
13 serial0 = &uartd; 13 serial0 = &uartd;
14 }; 14 };
15 15
16 chosen {
17 stdout-path = "serial0:115200n8";
18 };
19
16 memory { 20 memory {
17 reg = <0x00000000 0x40000000>; 21 reg = <0x00000000 0x40000000>;
18 }; 22 };
diff --git a/arch/arm/boot/dts/tegra20-iris-512.dts b/arch/arm/boot/dts/tegra20-iris-512.dts
index 1dd7d7bfdfcc..bb56dfe9e10c 100644
--- a/arch/arm/boot/dts/tegra20-iris-512.dts
+++ b/arch/arm/boot/dts/tegra20-iris-512.dts
@@ -11,6 +11,10 @@
11 serial1 = &uartd; 11 serial1 = &uartd;
12 }; 12 };
13 13
14 chosen {
15 stdout-path = "serial0:115200n8";
16 };
17
14 host1x@50000000 { 18 host1x@50000000 {
15 hdmi@54280000 { 19 hdmi@54280000 {
16 status = "okay"; 20 status = "okay";
diff --git a/arch/arm/boot/dts/tegra20-medcom-wide.dts b/arch/arm/boot/dts/tegra20-medcom-wide.dts
index 9b87526ab0b7..34c6588e92ef 100644
--- a/arch/arm/boot/dts/tegra20-medcom-wide.dts
+++ b/arch/arm/boot/dts/tegra20-medcom-wide.dts
@@ -10,6 +10,10 @@
10 serial0 = &uartd; 10 serial0 = &uartd;
11 }; 11 };
12 12
13 chosen {
14 stdout-path = "serial0:115200n8";
15 };
16
13 pwm@7000a000 { 17 pwm@7000a000 {
14 status = "okay"; 18 status = "okay";
15 }; 19 };
diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts
index fce397e3e2ce..33ed2b23026b 100644
--- a/arch/arm/boot/dts/tegra20-paz00.dts
+++ b/arch/arm/boot/dts/tegra20-paz00.dts
@@ -14,6 +14,10 @@
14 serial1 = &uartc; 14 serial1 = &uartc;
15 }; 15 };
16 16
17 chosen {
18 stdout-path = "serial0:115200n8";
19 };
20
17 memory { 21 memory {
18 reg = <0x00000000 0x20000000>; 22 reg = <0x00000000 0x20000000>;
19 }; 23 };
diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts
index a112a415ecd5..94b60a710dd8 100644
--- a/arch/arm/boot/dts/tegra20-seaboard.dts
+++ b/arch/arm/boot/dts/tegra20-seaboard.dts
@@ -13,6 +13,10 @@
13 serial0 = &uartd; 13 serial0 = &uartd;
14 }; 14 };
15 15
16 chosen {
17 stdout-path = "serial0:115200n8";
18 };
19
16 memory { 20 memory {
17 reg = <0x00000000 0x40000000>; 21 reg = <0x00000000 0x40000000>;
18 }; 22 };
diff --git a/arch/arm/boot/dts/tegra20-tamonten.dtsi b/arch/arm/boot/dts/tegra20-tamonten.dtsi
index 13d4e6185275..025e9e8037da 100644
--- a/arch/arm/boot/dts/tegra20-tamonten.dtsi
+++ b/arch/arm/boot/dts/tegra20-tamonten.dtsi
@@ -10,6 +10,10 @@
10 serial0 = &uartd; 10 serial0 = &uartd;
11 }; 11 };
12 12
13 chosen {
14 stdout-path = "serial0:115200n8";
15 };
16
13 memory { 17 memory {
14 reg = <0x00000000 0x20000000>; 18 reg = <0x00000000 0x20000000>;
15 }; 19 };
diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
index a4aaff326f99..4a035f74043a 100644
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -13,6 +13,10 @@
13 serial0 = &uarta; 13 serial0 = &uarta;
14 }; 14 };
15 15
16 chosen {
17 stdout-path = "serial0:115200n8";
18 };
19
16 memory { 20 memory {
17 reg = <0x00000000 0x40000000>; 21 reg = <0x00000000 0x40000000>;
18 }; 22 };
diff --git a/arch/arm/boot/dts/tegra20-ventana.dts b/arch/arm/boot/dts/tegra20-ventana.dts
index b205935a1236..a28c060a839b 100644
--- a/arch/arm/boot/dts/tegra20-ventana.dts
+++ b/arch/arm/boot/dts/tegra20-ventana.dts
@@ -13,6 +13,10 @@
13 serial0 = &uartd; 13 serial0 = &uartd;
14 }; 14 };
15 15
16 chosen {
17 stdout-path = "serial0:115200n8";
18 };
19
16 memory { 20 memory {
17 reg = <0x00000000 0x40000000>; 21 reg = <0x00000000 0x40000000>;
18 }; 22 };
diff --git a/arch/arm/boot/dts/tegra20-whistler.dts b/arch/arm/boot/dts/tegra20-whistler.dts
index 5564d6e975d8..073806d07b2b 100644
--- a/arch/arm/boot/dts/tegra20-whistler.dts
+++ b/arch/arm/boot/dts/tegra20-whistler.dts
@@ -13,6 +13,10 @@
13 serial0 = &uarta; 13 serial0 = &uarta;
14 }; 14 };
15 15
16 chosen {
17 stdout-path = "serial0:115200n8";
18 };
19
16 memory { 20 memory {
17 reg = <0x00000000 0x20000000>; 21 reg = <0x00000000 0x20000000>;
18 }; 22 };
diff --git a/arch/arm/boot/dts/tegra30-apalis-eval.dts b/arch/arm/boot/dts/tegra30-apalis-eval.dts
index 3ca3b4c6975b..99a69457dbf5 100644
--- a/arch/arm/boot/dts/tegra30-apalis-eval.dts
+++ b/arch/arm/boot/dts/tegra30-apalis-eval.dts
@@ -17,6 +17,10 @@
17 serial3 = &uartd; 17 serial3 = &uartd;
18 }; 18 };
19 19
20 chosen {
21 stdout-path = "serial0:115200n8";
22 };
23
20 pcie-controller@00003000 { 24 pcie-controller@00003000 {
21 status = "okay"; 25 status = "okay";
22 26
diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts
index 3dede3934446..1eca3b28ac64 100644
--- a/arch/arm/boot/dts/tegra30-beaver.dts
+++ b/arch/arm/boot/dts/tegra30-beaver.dts
@@ -12,6 +12,10 @@
12 serial0 = &uarta; 12 serial0 = &uarta;
13 }; 13 };
14 14
15 chosen {
16 stdout-path = "serial0:115200n8";
17 };
18
15 memory { 19 memory {
16 reg = <0x80000000 0x7ff00000>; 20 reg = <0x80000000 0x7ff00000>;
17 }; 21 };
diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
index 1714e755c3de..4721c1c9c780 100644
--- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -35,6 +35,10 @@
35 serial1 = &uartc; 35 serial1 = &uartc;
36 }; 36 };
37 37
38 chosen {
39 stdout-path = "serial0:115200n8";
40 };
41
38 memory { 42 memory {
39 reg = <0x80000000 0x40000000>; 43 reg = <0x80000000 0x40000000>;
40 }; 44 };
diff --git a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
index 72c79ac9a72f..76875c3160fe 100644
--- a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
@@ -15,6 +15,10 @@
15 serial2 = &uartd; 15 serial2 = &uartd;
16 }; 16 };
17 17
18 chosen {
19 stdout-path = "serial0:115200n8";
20 };
21
18 host1x@50000000 { 22 host1x@50000000 {
19 dc@54200000 { 23 dc@54200000 {
20 rgb { 24 rgb {
generated by cgit v1.2.2 (git 2.25.0) at 2025-04-15 01:39:29 -0400