ARM: tegra: Add stdout-path for various boards

[cascardo/linux.git] / arch / arm / boot / dts / tegra124-nyan.dtsi

diff --git a/arch/arm/boot/dts/tegra124-nyan.dtsi b/arch/arm/boot/dts/tegra124-nyan.dtsi
index ec1aa64..5f1fc14 100644 (file)
--- a/arch/arm/boot/dts/tegra124-nyan.dtsi
+++ b/arch/arm/boot/dts/tegra124-nyan.dtsi
@@ -8,6 +8,10 @@
                serial0 = &uarta;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        memory {
                reg = <0x0 0x80000000 0x0 0x80000000>;
        };
@@ -509,7 +513,7 @@
                        linux,input-type = <5>;
                        linux,code = <KEY_RESERVED>;
                        debounce-interval = <1>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                power {
@@ -517,7 +521,7 @@
                        gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
                        debounce-interval = <30>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
        };