Merge tag 'trace-seq-buf-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...

[cascardo/linux.git] / arch / arm / boot / dts / sh73a0-kzm9g-reference.dts

diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
index 30ef97e..939be12 100644 (file)
--- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
@@ -40,6 +40,7 @@
 
        chosen {
                bootargs = "console=tty0 console=ttySC4,115200 root=/dev/nfs ip=dhcp ignore_loglevel rw";
+               stdout-path = &scifa4;
        };
 
        memory {
@@ -100,19 +101,23 @@
                compatible = "gpio-leds";
                led1 {
                        gpios = <&pfc 20 GPIO_ACTIVE_LOW>;
+                       label = "LED1";
                };
                led2 {
                        gpios = <&pfc 21 GPIO_ACTIVE_LOW>;
+                       label = "LED2";
                };
                led3 {
                        gpios = <&pfc 22 GPIO_ACTIVE_LOW>;
+                       label = "LED3";
                };
                led4 {
                        gpios = <&pfc 23 GPIO_ACTIVE_LOW>;
+                       label = "LED4";
                };
        };
 
-       gpio-keys {
+       keyboard {
                compatible = "gpio-keys";
 
                back-key {
@@ -250,7 +255,7 @@
                };
        };
 
-       ak4648: ak4648@0x12 {
+       ak4648: ak4648@12 {
                #sound-dai-cells = <0>;
                compatible = "asahi-kasei,ak4648";
                reg = <0x12>;