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

[u-boot] / arch / arm / dts / uniphier-pro4-sanji.dts

diff --git a/arch/arm/dts/uniphier-pro4-sanji.dts b/arch/arm/dts/uniphier-pro4-sanji.dts
index d43f725b39a05654c26fa814e19ff8c0bb182d79..568dbd5a4ae3421f96e6124002178467e6ff2003 100644 (file)
--- a/arch/arm/dts/uniphier-pro4-sanji.dts
+++ b/arch/arm/dts/uniphier-pro4-sanji.dts
@@ -4,7 +4,7 @@
  * Copyright (C) 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/;
@@ -14,11 +14,6 @@
        model = "UniPhier Pro4 Sanji Board";
        compatible = "socionext,uniphier-pro4-sanji", "socionext,uniphier-pro4";
 
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x80000000>;
-       };
-
        chosen {
                stdout-path = "serial0:115200n8";
        };
@@ -33,6 +28,11 @@
                i2c5 = &i2c5;
                i2c6 = &i2c6;
        };
+
+       memory@80000000 {
+               device_type = "memory";
+               reg = <0x80000000 0x80000000>;
+       };
 };
 
 &serial0 {
@@ -47,8 +47,9 @@
        status = "okay";
 
        eeprom@54 {
-               compatible = "st,24c64", "i2c-eeprom";
+               compatible = "st,24c64", "atmel,24c64", "i2c-eeprom";
                reg = <0x54>;
+               pagesize = <32>;
                u-boot,i2c-offset-len = <2>;
        };
 };