Merge branch 'v4.9-shared/soc-hdr' into v4.9-armsoc/dts32

[cascardo/linux.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 2c82dab..7885075 100644 (file)
--- a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
@@ -20,20 +20,20 @@
        compatible = "renesas,armadillo800eva", "renesas,r8a7740";
 
        aliases {
-               serial1 = &scifa1;
+               serial0 = &scifa1;
        };
 
        chosen {
-               bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
-               stdout-path = &scifa1;
+               bootargs = "earlyprintk ignore_loglevel root=/dev/nfs ip=dhcp rw";
+               stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@40000000 {
                device_type = "memory";
                reg = <0x40000000 0x20000000>;
        };
 
-       reg_3p3v: regulator@0 {
+       reg_3p3v: regulator-3p3v {
                compatible = "regulator-fixed";
                regulator-name = "fixed-3.3V";
                regulator-min-microvolt = <3300000>;
@@ -42,7 +42,7 @@
                regulator-boot-on;
        };
 
-       vcc_sdhi0: regulator@1 {
+       vcc_sdhi0: regulator-vcc-sdhi0 {
                compatible = "regulator-fixed";
 
                regulator-name = "SDHI0 Vcc";
@@ -53,7 +53,7 @@
                enable-active-high;
        };
 
-       vccq_sdhi0: regulator@2 {
+       vccq_sdhi0: regulator-vccq-sdhi0 {
                compatible = "regulator-gpio";
 
                regulator-name = "SDHI0 VccQ";
@@ -69,7 +69,7 @@
                enable-active-high;
        };
 
-       reg_5p0v: regulator@3 {
+       reg_5p0v: regulator-5p0v {
                compatible = "regulator-fixed";
                regulator-name = "fixed-5.0V";
                regulator-min-microvolt = <5000000>;
@@ -127,7 +127,7 @@
                };
        };
 
-       i2c2: i2c@2 {
+       i2c2: i2c-2 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "i2c-gpio";
@@ -232,7 +232,7 @@
                function = "gether";
        };
 
-       scifa1_pins: serial1 {
+       scifa1_pins: scifa1 {
                groups = "scifa1_data";
                function = "scifa1";
        };