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

[oweals/u-boot.git] / arch / arm / dts / uniphier-ld4-ref.dts

diff --git a/arch/arm/dts/uniphier-ld4-ref.dts b/arch/arm/dts/uniphier-ld4-ref.dts
index 0f4bd9bda227f813ab61490cc496a8ed1920f8ea..0f50acb24c2c2474f334d18520111bf49ecae7e8 100644 (file)
--- a/arch/arm/dts/uniphier-ld4-ref.dts
+++ b/arch/arm/dts/uniphier-ld4-ref.dts
@@ -4,23 +4,18 @@
  * Copyright (C) 2015-2016 Socionext Inc.
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  *
- * SPDX-License-Identifier:    GPL-2.0+        X11
+ * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
 /dts-v1/;
-/include/ "uniphier-ld4.dtsi"
-/include/ "uniphier-ref-daughter.dtsi"
-/include/ "uniphier-support-card.dtsi"
+#include "uniphier-ld4.dtsi"
+#include "uniphier-ref-daughter.dtsi"
+#include "uniphier-support-card.dtsi"
 
 / {
        model = "UniPhier LD4 Reference Board";
        compatible = "socionext,uniphier-ld4-ref", "socionext,uniphier-ld4";
 
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x20000000>;
-       };
-
        chosen {
                stdout-path = "serial0:115200n8";
        };
@@ -35,6 +30,11 @@
                i2c2 = &i2c2;
                i2c3 = &i2c3;
        };
+
+       memory@80000000 {
+               device_type = "memory";
+               reg = <0x80000000 0x20000000>;
+       };
 };
 
 &ethsc {