Merge tag 'u-boot-imx-20191105' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / arch / arm / dts / uniphier-pro4-ace.dts

diff --git a/arch/arm/dts/uniphier-pro4-ace.dts b/arch/arm/dts/uniphier-pro4-ace.dts
index f70bc82e25735ff4130022158e0725728738cbba..ce8ea7b79bbf3f34ac80efecbe9749c7eb2f7e6c 100644 (file)
--- a/arch/arm/dts/uniphier-pro4-ace.dts
+++ b/arch/arm/dts/uniphier-pro4-ace.dts
@@ -1,24 +1,17 @@
-/*
- * Device Tree Source for UniPhier Pro4 Ace Board
- *
- * 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
+//
+// Device Tree Source for UniPhier Pro4 Ace Board
+//
+// Copyright (C) 2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 /dts-v1/;
-/include/ "uniphier-pro4.dtsi"
+#include "uniphier-pro4.dtsi"
 
 / {
        model = "UniPhier Pro4 Ace Board";
        compatible = "socionext,uniphier-pro4-ace", "socionext,uniphier-pro4";
 
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x40000000>;
-       };
-
        chosen {
                stdout-path = "serial0:115200n8";
        };
@@ -34,6 +27,11 @@
                i2c5 = &i2c5;
                i2c6 = &i2c6;
        };
+
+       memory@80000000 {
+               device_type = "memory";
+               reg = <0x80000000 0x40000000>;
+       };
 };
 
 &serial0 {
@@ -52,8 +50,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>;
        };
 };
@@ -74,27 +73,29 @@
        status = "okay";
 };
 
-&usb0 {
+&usb2 {
        status = "okay";
 };
 
-&usb1 {
+&usb3 {
        status = "okay";
 };
 
-&usb2 {
+&eth {
        status = "okay";
+       phy-handle = <&ethphy>;
 };
 
-&usb3 {
-       status = "okay";
+&mdio {
+       ethphy: ethphy@1 {
+               reg = <1>;
+       };
 };
 
-/* for U-Boot only */
-&serial0 {
-       u-boot,dm-pre-reloc;
+&usb0 {
+       status = "okay";
 };
 
-&pinctrl_uart0 {
-       u-boot,dm-pre-reloc;
+&usb1 {
+       status = "okay";
 };