Merge tag 'mips-pull-2019-11-16' of git://git.denx.de/u-boot-mips

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

diff --git a/arch/arm/dts/uniphier-pro4-ref.dts b/arch/arm/dts/uniphier-pro4-ref.dts
index a1fbbdc2bcbbed788a15e737f4cc69ecf0727ab6..06065eb36cad1cfb21181c860f9922661cea79d2 100644 (file)
--- a/arch/arm/dts/uniphier-pro4-ref.dts
+++ b/arch/arm/dts/uniphier-pro4-ref.dts
@@ -1,16 +1,14 @@
-/*
- * Device Tree Source for UniPhier Pro4 Reference Board
- *
- * Copyright (C) 2015-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 Reference Board
+//
+// Copyright (C) 2015-2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 /dts-v1/;
-/include/ "uniphier-pro4.dtsi"
-/include/ "uniphier-ref-daughter.dtsi"
-/include/ "uniphier-support-card.dtsi"
+#include "uniphier-pro4.dtsi"
+#include "uniphier-ref-daughter.dtsi"
+#include "uniphier-support-card.dtsi"
 
 / {
        model = "UniPhier Pro4 Reference Board";
@@ -41,7 +39,7 @@
 };
 
 &ethsc {
-       interrupts = <0 50 4>;
+       interrupts = <2 8>;
 };
 
 &serial0 {
@@ -56,6 +54,14 @@
        status = "okay";
 };
 
+&gpio {
+       xirq2 {
+               gpio-hog;
+               gpios = <UNIPHIER_GPIO_IRQ(2) 0>;
+               input;
+       };
+};
+
 &i2c0 {
        status = "okay";
 };
@@ -64,16 +70,23 @@
        status = "okay";
 };
 
-&sd1 {
+&usb2 {
        status = "okay";
 };
 
-&usb2 {
+&usb3 {
        status = "okay";
 };
 
-&usb3 {
+&eth {
        status = "okay";
+       phy-handle = <&ethphy>;
+};
+
+&mdio {
+       ethphy: ethphy@0 {
+               reg = <0>;
+       };
 };
 
 &usb0 {
@@ -84,11 +97,6 @@
        status = "okay";
 };
 
-/* for U-Boot only */
-&serial0 {
-       u-boot,dm-pre-reloc;
-};
-
-&pinctrl_uart0 {
-       u-boot,dm-pre-reloc;
+&nand {
+       status = "okay";
 };