Merge git://git.denx.de/u-boot-sh

[u-boot] / arch / arm / dts / uniphier-pro5-4kbox.dts

diff --git a/arch/arm/dts/uniphier-pro5-4kbox.dts b/arch/arm/dts/uniphier-pro5-4kbox.dts
index ffc21a7c500c5ab817b0f776c4554fd084d86069..d59309000b5a5abde6ccc334615ba1739a736b8e 100644 (file)
--- a/arch/arm/dts/uniphier-pro5-4kbox.dts
+++ b/arch/arm/dts/uniphier-pro5-4kbox.dts
@@ -4,7 +4,7 @@
  * Copyright (C) 2015-2016 Socionext Inc.
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  *
- * SPDX-License-Identifier:    GPL-2.0+
+ * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
 /dts-v1/;
@@ -14,11 +14,6 @@
        model = "UniPhier Pro5 4KBOX Board";
        compatible = "socionext,uniphier-pro5-4kbox", "socionext,uniphier-pro5";
 
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x40000000>;
-       };
-
        chosen {
                stdout-path = "serial1:115200n8";
        };
@@ -30,6 +25,11 @@
                i2c5 = &i2c5;
                i2c6 = &i2c6;
        };
+
+       memory {
+               device_type = "memory";
+               reg = <0x80000000 0x40000000>;
+       };
 };
 
 &serial1 {