Merge branch 'for-3.19' of git://linux-nfs.org/~bfields/linux

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / r8a7740-armadillo800eva.dts

diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
index effb7b46f13172d5cb30180caa283a05fd9a5a72..d4af4d86c6b03d01bbc5ba75b015f76d5e5e4cd6 100644 (file)
--- a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
@@ -25,6 +25,7 @@
 
        chosen {
                bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
+               stdout-path = &scifa1;
        };
 
        memory {
@@ -77,7 +78,7 @@
                regulator-boot-on;
        };
 
-       gpio-keys {
+       keyboard {
                compatible = "gpio-keys";
 
                power-key {
@@ -298,3 +299,7 @@
 
        status = "okay";
 };
+
+&tmu0 {
+       status = "okay";
+};