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>

diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts
index f767c425d0b5d277a369e4d1101efe26a208d3fb..b811461414023fa293c75130d30d840fa4e5d3af 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -31,6 +31,7 @@
 
        chosen {
                bootargs ="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc";
+               stdout-path = &serial_2;
        };
 
        regulators {

diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts
index 676e6e0c8cf396b562bc3971db21ef93deb35406..86216fff1b4f42db7b4e7fb2cfc5beed60b30d39 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-smdkv310.dts
+++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts
@@ -27,6 +27,7 @@
 
        chosen {
                bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc";
+               stdout-path = &serial_1;
        };
 
        sdhci@12530000 {

diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts
index 720836205546f22dd078d590aef80664d2af7011..a406df3d6df87e3c223ef5bd5138da1de831834c 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-trats.dts
+++ b/arch/arm/boot/dts/exynos4210-trats.dts
@@ -28,6 +28,7 @@
 
        chosen {
                bootargs = "console=ttySAC2,115200N8 root=/dev/mmcblk0p5 rootwait earlyprintk panic=5";
+               stdout-path = &serial_2;
        };
 
        regulators {

diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts
index aaf0cae4f5e87bd976d34a591f52f11b5f4990c5..6effb13f98a6c268c593da22edc1664bfdd258ff 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-universal_c210.dts
+++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts
@@ -26,6 +26,7 @@
 
        chosen {
                bootargs = "console=ttySAC2,115200N8 root=/dev/mmcblk0p5 rw rootwait earlyprintk panic=5 maxcpus=1";
+               stdout-path = &serial_2;
        };
 
        sysram@02020000 {

diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index 3fbf588682b94fcf8f6b340ad266794741825f34..d9610f38a78eb2409aa4b03c6170aa9286ac8905 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -11,6 +11,10 @@
 #include "exynos4412.dtsi"
 
 / {
+       chosen {
+               stdout-path = &serial_1;
+       };
+
        firmware@0204F000 {
                compatible = "samsung,secure-firmware";
                reg = <0x0204F000 0x1000>;

diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index de15114fd07cafa2ef7bc4b39f41196ac9fd2337..bd8b73077d41faed72e4465280dc3f58c50b7385 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -26,6 +26,7 @@
 
        chosen {
                bootargs ="console=ttySAC2,115200";
+               stdout-path = &serial_2;
        };
 
        firmware@0203F000 {

diff --git a/arch/arm/boot/dts/exynos4412-smdk4412.dts b/arch/arm/boot/dts/exynos4412-smdk4412.dts
index ded0b70f764485bc0ab4fc6e4cc23f895b509f4b..b9256afbcc683ecdc3df2daf3d7276eee7fc1a2e 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-smdk4412.dts
+++ b/arch/arm/boot/dts/exynos4412-smdk4412.dts
@@ -25,6 +25,7 @@
 
        chosen {
                bootargs ="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc";
+               stdout-path = &serial_1;
        };
 
        g2d@10800000 {

diff --git a/arch/arm/boot/dts/exynos4412-tiny4412.dts b/arch/arm/boot/dts/exynos4412-tiny4412.dts
index ea6929d9c6212ff75943df09cee7fb49cc196020..d46fd4c2aeaa5a04bc4ba143150fe50626d0473b 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-tiny4412.dts
+++ b/arch/arm/boot/dts/exynos4412-tiny4412.dts
@@ -18,6 +18,10 @@
        model = "FriendlyARM TINY4412 board based on Exynos4412";
        compatible = "friendlyarm,tiny4412", "samsung,exynos4412", "samsung,exynos4";
 
+       chosen {
+               stdout-path = &serial_0;
+       };
+
        memory {
                reg = <0x40000000 0x40000000>;
        };

diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index 29231b4526433ef0fbae30e81d81088671dc3ac1..5fbb01335a0f6d7576e1b56caae212068f50316e 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -32,6 +32,7 @@
 
        chosen {
                bootargs = "console=ttySAC2,115200N8 root=/dev/mmcblk0p5 rootwait earlyprintk panic=5";
+               stdout-path = &serial_2;
        };
 
        firmware@0204F000 {