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

[u-boot] / arch / arm / dts / uniphier-pxs2-vodka.dts

diff --git a/arch/arm/dts/uniphier-pxs2-vodka.dts b/arch/arm/dts/uniphier-pxs2-vodka.dts
index f3816965a3153fffeda90623d6d4b7a9e64bd161..d13e5f2b6c10c75aa34b6e53967bae6d62da274d 100644 (file)
--- a/arch/arm/dts/uniphier-pxs2-vodka.dts
+++ b/arch/arm/dts/uniphier-pxs2-vodka.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/;
@@ -28,7 +28,7 @@
                i2c6 = &i2c6;
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x80000000>;
        };