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 679e48b5aee25f070b89ffb4e2811b363469c61e..ce8ea7b79bbf3f34ac80efecbe9749c7eb2f7e6c 100644 (file)
--- a/arch/arm/dts/uniphier-pro4-ace.dts
+++ b/arch/arm/dts/uniphier-pro4-ace.dts
@@ -1,14 +1,12 @@
-/*
- * 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";
@@ -52,7 +50,7 @@
        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>;
@@ -75,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";
 };