Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[u-boot] / arch / arm / dts / uniphier-ld20-ref.dts

diff --git a/arch/arm/dts/uniphier-ld20-ref.dts b/arch/arm/dts/uniphier-ld20-ref.dts
index 044e0007492c0b6206b2768d809103f6da381604..9cbd1f2941ea05441e7744c9aa1fb2552efeffe0 100644 (file)
--- a/arch/arm/dts/uniphier-ld20-ref.dts
+++ b/arch/arm/dts/uniphier-ld20-ref.dts
@@ -16,6 +16,10 @@
        model = "UniPhier LD20 Reference Board";
        compatible = "socionext,uniphier-ld20-ref", "socionext,uniphier-ld20";
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        aliases {
                serial0 = &serial0;
                serial1 = &serial1;
@@ -29,14 +33,10 @@
                i2c5 = &i2c5;
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0 0x80000000 0 0xc0000000>;
        };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
 };
 
 &ethsc {
@@ -59,7 +59,3 @@
 &pinctrl_uart0 {
        u-boot,dm-pre-reloc;
 };
-
-&pinctrl_system_bus {
-       u-boot,dm-pre-reloc;
-};