From: Geert Uytterhoeven Date: Mon, 6 Oct 2014 11:59:13 +0000 (+0200) Subject: ARM: shmobile: kzm9d dts: Add chosen/stdout-path X-Git-Tag: firefly_0821_release~176^2~2656^2~17^2~8 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=120f038cf04b95dc895cba503a7516ff75561438;p=firefly-linux-kernel-4.4.55.git ARM: shmobile: kzm9d 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=ttyS1,115200n81" parameter in chosen/bootargs, else the console will use the default setting of 9600 baud. Signed-off-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- diff --git a/arch/arm/boot/dts/emev2-kzm9d.dts b/arch/arm/boot/dts/emev2-kzm9d.dts index a1794cbd23fe..667d323e80a3 100644 --- a/arch/arm/boot/dts/emev2-kzm9d.dts +++ b/arch/arm/boot/dts/emev2-kzm9d.dts @@ -25,6 +25,7 @@ chosen { bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp"; + stdout-path = &uart1; }; gpio_keys {