diff options
author | Tomasz Figa <t.figa@samsung.com> | 2015-01-23 08:47:42 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-02 13:11:26 -0500 |
commit | 62d38099bf9dd0bdb582369b3cd049b67a0f1ac1 (patch) | |
tree | a4ee427f290df96793580a9f05cfdd27944a851f /arch | |
parent | b94ba0328d3b36ff95f5074c0e9b44f90dc56bb5 (diff) |
ARM: dts: exynos4: Add stdout-path properties
This patch adds stdout-path property to chosen nodes of Exynos4 boards
to enable use of earlycon feature without the need to hardcode port
number in kernel itself.
Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/exynos4210-origen.dts | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos4210-smdkv310.dts | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos4210-trats.dts | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos4210-universal_c210.dts | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos4412-origen.dts | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos4412-smdk4412.dts | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos4412-tiny4412.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos4412-trats2.dts | 1 |
9 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts index f767c425d0b5..b81146141402 100644 --- a/arch/arm/boot/dts/exynos4210-origen.dts +++ b/arch/arm/boot/dts/exynos4210-origen.dts | |||
@@ -31,6 +31,7 @@ | |||
31 | 31 | ||
32 | chosen { | 32 | chosen { |
33 | bootargs ="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc"; | 33 | bootargs ="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc"; |
34 | stdout-path = &serial_2; | ||
34 | }; | 35 | }; |
35 | 36 | ||
36 | regulators { | 37 | regulators { |
diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts index 676e6e0c8cf3..86216fff1b4f 100644 --- a/arch/arm/boot/dts/exynos4210-smdkv310.dts +++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | chosen { | 28 | chosen { |
29 | bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc"; | 29 | bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc"; |
30 | stdout-path = &serial_1; | ||
30 | }; | 31 | }; |
31 | 32 | ||
32 | sdhci@12530000 { | 33 | sdhci@12530000 { |
diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts index 720836205546..a406df3d6df8 100644 --- a/arch/arm/boot/dts/exynos4210-trats.dts +++ b/arch/arm/boot/dts/exynos4210-trats.dts | |||
@@ -28,6 +28,7 @@ | |||
28 | 28 | ||
29 | chosen { | 29 | chosen { |
30 | bootargs = "console=ttySAC2,115200N8 root=/dev/mmcblk0p5 rootwait earlyprintk panic=5"; | 30 | bootargs = "console=ttySAC2,115200N8 root=/dev/mmcblk0p5 rootwait earlyprintk panic=5"; |
31 | stdout-path = &serial_2; | ||
31 | }; | 32 | }; |
32 | 33 | ||
33 | regulators { | 34 | regulators { |
diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts index aaf0cae4f5e8..6effb13f98a6 100644 --- a/arch/arm/boot/dts/exynos4210-universal_c210.dts +++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts | |||
@@ -26,6 +26,7 @@ | |||
26 | 26 | ||
27 | chosen { | 27 | chosen { |
28 | bootargs = "console=ttySAC2,115200N8 root=/dev/mmcblk0p5 rw rootwait earlyprintk panic=5 maxcpus=1"; | 28 | bootargs = "console=ttySAC2,115200N8 root=/dev/mmcblk0p5 rw rootwait earlyprintk panic=5 maxcpus=1"; |
29 | stdout-path = &serial_2; | ||
29 | }; | 30 | }; |
30 | 31 | ||
31 | sysram@02020000 { | 32 | sysram@02020000 { |
diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi index 3fbf588682b9..d9610f38a78e 100644 --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi | |||
@@ -11,6 +11,10 @@ | |||
11 | #include "exynos4412.dtsi" | 11 | #include "exynos4412.dtsi" |
12 | 12 | ||
13 | / { | 13 | / { |
14 | chosen { | ||
15 | stdout-path = &serial_1; | ||
16 | }; | ||
17 | |||
14 | firmware@0204F000 { | 18 | firmware@0204F000 { |
15 | compatible = "samsung,secure-firmware"; | 19 | compatible = "samsung,secure-firmware"; |
16 | reg = <0x0204F000 0x1000>; | 20 | reg = <0x0204F000 0x1000>; |
diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts index de15114fd07c..bd8b73077d41 100644 --- a/arch/arm/boot/dts/exynos4412-origen.dts +++ b/arch/arm/boot/dts/exynos4412-origen.dts | |||
@@ -26,6 +26,7 @@ | |||
26 | 26 | ||
27 | chosen { | 27 | chosen { |
28 | bootargs ="console=ttySAC2,115200"; | 28 | bootargs ="console=ttySAC2,115200"; |
29 | stdout-path = &serial_2; | ||
29 | }; | 30 | }; |
30 | 31 | ||
31 | firmware@0203F000 { | 32 | firmware@0203F000 { |
diff --git a/arch/arm/boot/dts/exynos4412-smdk4412.dts b/arch/arm/boot/dts/exynos4412-smdk4412.dts index ded0b70f7644..b9256afbcc68 100644 --- a/arch/arm/boot/dts/exynos4412-smdk4412.dts +++ b/arch/arm/boot/dts/exynos4412-smdk4412.dts | |||
@@ -25,6 +25,7 @@ | |||
25 | 25 | ||
26 | chosen { | 26 | chosen { |
27 | bootargs ="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc"; | 27 | bootargs ="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc"; |
28 | stdout-path = &serial_1; | ||
28 | }; | 29 | }; |
29 | 30 | ||
30 | g2d@10800000 { | 31 | g2d@10800000 { |
diff --git a/arch/arm/boot/dts/exynos4412-tiny4412.dts b/arch/arm/boot/dts/exynos4412-tiny4412.dts index ea6929d9c621..d46fd4c2aeaa 100644 --- a/arch/arm/boot/dts/exynos4412-tiny4412.dts +++ b/arch/arm/boot/dts/exynos4412-tiny4412.dts | |||
@@ -18,6 +18,10 @@ | |||
18 | model = "FriendlyARM TINY4412 board based on Exynos4412"; | 18 | model = "FriendlyARM TINY4412 board based on Exynos4412"; |
19 | compatible = "friendlyarm,tiny4412", "samsung,exynos4412", "samsung,exynos4"; | 19 | compatible = "friendlyarm,tiny4412", "samsung,exynos4412", "samsung,exynos4"; |
20 | 20 | ||
21 | chosen { | ||
22 | stdout-path = &serial_0; | ||
23 | }; | ||
24 | |||
21 | memory { | 25 | memory { |
22 | reg = <0x40000000 0x40000000>; | 26 | reg = <0x40000000 0x40000000>; |
23 | }; | 27 | }; |
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts index 29231b452643..5fbb01335a0f 100644 --- a/arch/arm/boot/dts/exynos4412-trats2.dts +++ b/arch/arm/boot/dts/exynos4412-trats2.dts | |||
@@ -32,6 +32,7 @@ | |||
32 | 32 | ||
33 | chosen { | 33 | chosen { |
34 | bootargs = "console=ttySAC2,115200N8 root=/dev/mmcblk0p5 rootwait earlyprintk panic=5"; | 34 | bootargs = "console=ttySAC2,115200N8 root=/dev/mmcblk0p5 rootwait earlyprintk panic=5"; |
35 | stdout-path = &serial_2; | ||
35 | }; | 36 | }; |
36 | 37 | ||
37 | firmware@0204F000 { | 38 | firmware@0204F000 { |