summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2014-10-03 19:11:37 +0400
committerSimon Horman <horms+renesas@verge.net.au>2014-10-24 05:44:09 +0400
commit2c32622c3f3f9c7e0d3480c1fc0a31a95e04dd91 (patch)
tree8e0db8d29cfe2a34d1d38ad1ef51db96bb0b8ee6 /arch/arm
parent71787aaa6015c4b7f47126c053afd8f2bebb00d7 (diff)
downloadlinux-2c32622c3f3f9c7e0d3480c1fc0a31a95e04dd91.tar.xz
ARM: shmobile: armadillo800eva 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. In addition, this will allow the PM domain code to find the PM domain for the console device. Note that we have to keep the "console=ttySC1" parameter in chosen/bootargs, else we only get console messages on tty0, and because this DTS is shared between legacy and multi-platform. 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/r8a7740-armadillo800eva.dts1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
index effb7b46f131..2703428557fc 100644
--- a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
@@ -25,6 +25,7 @@
chosen {
bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
+ stdout-path = &scifa1;
};
memory {