Merge branch 'master' of git://git.denx.de/u-boot

[oweals/u-boot.git] / 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 778e2bb4b78dc75a4c0cf1a74b70bfef26992bd5..3b68a7c605c2a41182c5f76e19366b2980ff5966 100644 (file)
--- a/arch/arm/dts/uniphier-pro4-sanji.dts
+++ b/arch/arm/dts/uniphier-pro4-sanji.dts
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier Pro4 Sanji Board
- *
- * Copyright (C) 2016 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier Pro4 Sanji Board
+//
+// Copyright (C) 2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 /dts-v1/;
 #include "uniphier-pro4.dtsi"
@@ -47,10 +45,9 @@
        status = "okay";
 
        eeprom@54 {
-               compatible = "st,24c64", "atmel,24c64", "i2c-eeprom";
+               compatible = "st,24c64", "atmel,24c64";
                reg = <0x54>;
                pagesize = <32>;
-               u-boot,i2c-offset-len = <2>;
        };
 };
 
@@ -70,14 +67,6 @@
        status = "okay";
 };
 
-&usb0 {
-       status = "okay";
-};
-
-&usb1 {
-       status = "okay";
-};
-
 &usb2 {
        status = "okay";
 };
@@ -86,23 +75,21 @@
        status = "okay";
 };
 
-/* for U-Boot only */
-&serial0 {
-       u-boot,dm-pre-reloc;
-};
-
-&mio_clk {
-       u-boot,dm-pre-reloc;
+&eth {
+       status = "okay";
+       phy-handle = <&ethphy>;
 };
 
-&emmc {
-       u-boot,dm-pre-reloc;
+&mdio {
+       ethphy: ethphy@1 {
+               reg = <1>;
+       };
 };
 
-&pinctrl_uart0 {
-       u-boot,dm-pre-reloc;
+&usb0 {
+       status = "okay";
 };
 
-&pinctrl_emmc {
-       u-boot,dm-pre-reloc;
+&usb1 {
+       status = "okay";
 };