Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[sfrench/cifs-2.6.git] / arch / arm / boot / dts / tegra124-nyan.dtsi
index 4b978aaa50cfd83d20c8febc14d6005f7375a55d..0710a600cc69306ab1dc4619f0b8237851eba343 100644 (file)
@@ -8,6 +8,10 @@
                serial0 = &uarta;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        memory {
                reg = <0x0 0x80000000 0x0 0x80000000>;
        };
                        linux,input-type = <5>;
                        linux,code = <KEY_RESERVED>;
                        debounce-interval = <1>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
 
                power {
                        gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
                        debounce-interval = <30>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
        };