Merge tag 'for-linus' of git://github.com/openrisc/linux

[sfrench/cifs-2.6.git] / arch / openrisc / boot / dts / or1ksim.dts

diff --git a/arch/openrisc/boot/dts/or1ksim.dts b/arch/openrisc/boot/dts/or1ksim.dts
index 9f4b856da5805db4c01b42ba387f3c913536a426..d8aa8309c9d30981c9129b8610fd4b306e884f8d 100644 (file)
--- a/arch/openrisc/boot/dts/or1ksim.dts
+++ b/arch/openrisc/boot/dts/or1ksim.dts
@@ -6,8 +6,13 @@
        #size-cells = <1>;
        interrupt-parent = <&pic>;
 
+       aliases {
+               uart0 = &serial0;
+       };
+
        chosen {
-               bootargs = "console=uart,mmio,0x90000000,115200";
+               bootargs = "earlycon";
+               stdout-path = "uart0:115200";
        };
 
        memory@0 {