Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / arch / arm / boot / dts / emev2-kzm9d.dts

diff --git a/arch/arm/boot/dts/emev2-kzm9d.dts b/arch/arm/boot/dts/emev2-kzm9d.dts
index 9eb86f8..60d0a73 100644 (file)
--- a/arch/arm/boot/dts/emev2-kzm9d.dts
+++ b/arch/arm/boot/dts/emev2-kzm9d.dts
@@ -23,9 +23,13 @@
                reg = <0x40000000 0x8000000>;
        };
 
+       aliases {
+               serial1 = &uart1;
+       };
+
        chosen {
-               bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp";
-               stdout-path = &uart1;
+               bootargs = "ignore_loglevel root=/dev/nfs ip=dhcp";
+               stdout-path = "serial1:115200n8";
        };
 
        gpio_keys {