summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2014-10-03 17:11:43 +0200
committerSimon Horman <horms+renesas@verge.net.au>2014-10-24 10:44:10 +0900
commitb4a0f50cc70fef466e5b9935519b8213611e75bb (patch)
treebe0566f2326cee2faee3213ceeaaf2c7bb1706f6 /arch/arm
parent17323b3615b54bd80ba7e9056c62266e7df24f27 (diff)
ARM: shmobile: alt dts: Add chosen/stdout-path
Add a stdout-path property so that automatic console selection works in the absence of a "console=" parameter on the kernel command line. Note that we have to keep the "console=ttySC0,38400" parameter in chosen/bootargs, else the console will use the default setting of 115200 baud. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/r8a7794-alt.dts1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/r8a7794-alt.dts b/arch/arm/boot/dts/r8a7794-alt.dts
index 79d06ef017a0..8aec51268b7d 100644
--- a/arch/arm/boot/dts/r8a7794-alt.dts
+++ b/arch/arm/boot/dts/r8a7794-alt.dts
@@ -21,6 +21,7 @@
chosen {
bootargs = "console=ttySC0,38400 ignore_loglevel rw root=/dev/nfs ip=dhcp";
+ stdout-path = &scif2;
};
memory@40000000 {