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

[oweals/u-boot.git] / arch / arm / dts / uniphier-pxs2-gentil.dts

diff --git a/arch/arm/dts/uniphier-pxs2-gentil.dts b/arch/arm/dts/uniphier-pxs2-gentil.dts
index 0a6d46cb140de7da2be3bca82be9abde0e71e52c..4397714e49367773b0965d46fd377db4d7097f0f 100644 (file)
--- a/arch/arm/dts/uniphier-pxs2-gentil.dts
+++ b/arch/arm/dts/uniphier-pxs2-gentil.dts
@@ -4,22 +4,17 @@
  * 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/;
-/include/ "uniphier-pxs2.dtsi"
+#include "uniphier-pxs2.dtsi"
 
 / {
        model = "UniPhier PXs2 Gentil Board";
        compatible = "socionext,uniphier-pxs2-gentil",
                     "socionext,uniphier-pxs2";
 
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x80000000>;
-       };
-
        chosen {
                stdout-path = "serial0:115200n8";
        };
@@ -34,6 +29,11 @@
                i2c5 = &i2c5;
                i2c6 = &i2c6;
        };
+
+       memory@80000000 {
+               device_type = "memory";
+               reg = <0x80000000 0x80000000>;
+       };
 };
 
 &serial2 {
@@ -44,8 +44,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>;
        };
 };
@@ -65,24 +66,3 @@
 &usb1 {
        status = "okay";
 };
-
-/* for U-Boot only */
-&serial2 {
-       u-boot,dm-pre-reloc;
-};
-
-&sd_clk {
-       u-boot,dm-pre-reloc;
-};
-
-&emmc {
-       u-boot,dm-pre-reloc;
-};
-
-&pinctrl_uart2 {
-       u-boot,dm-pre-reloc;
-};
-
-&pinctrl_emmc {
-       u-boot,dm-pre-reloc;
-};