Merge tag 'v4.8-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / arch / arm / boot / dts / r8a7779-marzen.dts

diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts
index b795da6..541678d 100644 (file)
--- a/arch/arm/boot/dts/r8a7779-marzen.dts
+++ b/arch/arm/boot/dts/r8a7779-marzen.dts
@@ -25,15 +25,15 @@
 
        chosen {
                bootargs = "ignore_loglevel root=/dev/nfs ip=on";
-               stdout-path = &scif2;
+               stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@60000000 {
                device_type = "memory";
                reg = <0x60000000 0x40000000>;
        };
 
-       fixedregulator3v3: fixedregulator@0 {
+       fixedregulator3v3: regulator-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "fixed-3.3V";
                regulator-min-microvolt = <3300000>;
@@ -195,12 +195,12 @@
                };
        };
 
-       scif2_pins: serial2 {
+       scif2_pins: scif2 {
                groups = "scif2_data_c";
                function = "scif2";
        };
 
-       scif4_pins: serial4 {
+       scif4_pins: scif4 {
                groups = "scif4_data";
                function = "scif4";
        };