Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[cascardo/linux.git] / arch / arm / boot / dts / tegra20-whistler.dts

diff --git a/arch/arm/boot/dts/tegra20-whistler.dts b/arch/arm/boot/dts/tegra20-whistler.dts
index 340d811..073806d 100644 (file)
--- a/arch/arm/boot/dts/tegra20-whistler.dts
+++ b/arch/arm/boot/dts/tegra20-whistler.dts
@@ -13,6 +13,10 @@
                serial0 = &uarta;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        memory {
                reg = <0x00000000 0x20000000>;
        };
@@ -508,7 +512,7 @@
                nvidia,repeat-delay-ms = <160>;
                nvidia,kbc-row-pins = <0 1 2>;
                nvidia,kbc-col-pins = <16 17>;
-               nvidia,wakeup-source;
+               wakeup-source;
                linux,keymap = <MATRIX_KEY(0x00, 0x00, KEY_POWER)
                                MATRIX_KEY(0x01, 0x00, KEY_HOME)
                                MATRIX_KEY(0x01, 0x01, KEY_BACK)