Merge tag 'efi-2020-07-rc2-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

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

diff --git a/arch/arm/dts/uniphier-ld6b-ref.dts b/arch/arm/dts/uniphier-ld6b-ref.dts
index b4bb5b546a03f502cd6d26392cb9f2cae9d678d6..3d9080ee7aef73b5a1642757d5931b5345e698a6 100644 (file)
--- a/arch/arm/dts/uniphier-ld6b-ref.dts
+++ b/arch/arm/dts/uniphier-ld6b-ref.dts
@@ -1,16 +1,14 @@
-/*
- * Device Tree Source for UniPhier LD6b Reference Board
- *
- * Copyright (C) 2015-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 LD6b Reference Board
+//
+// Copyright (C) 2015-2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 /dts-v1/;
-/include/ "uniphier-ld6b.dtsi"
-/include/ "uniphier-ref-daughter.dtsi"
-/include/ "uniphier-support-card.dtsi"
+#include "uniphier-ld6b.dtsi"
+#include "uniphier-ref-daughter.dtsi"
+#include "uniphier-support-card.dtsi"
 
 / {
        model = "UniPhier LD6b Reference Board";
@@ -40,7 +38,7 @@
 };
 
 &ethsc {
-       interrupts = <0 52 4>;
+       interrupts = <4 8>;
 };
 
 &serial0 {
@@ -55,6 +53,14 @@
        status = "okay";
 };
 
+&gpio {
+       xirq4 {
+               gpio-hog;
+               gpios = <UNIPHIER_GPIO_IRQ(4) 0>;
+               input;
+       };
+};
+
 &i2c0 {
        status = "okay";
 };
@@ -63,19 +69,25 @@
        status = "okay";
 };
 
-&usb0 {
+&eth {
        status = "okay";
+       phy-handle = <&ethphy>;
 };
 
-&usb1 {
+&mdio {
+       ethphy: ethphy@0 {
+               reg = <0>;
+       };
+};
+
+&usb0 {
        status = "okay";
 };
 
-/* for U-Boot only */
-&serial0 {
-       u-boot,dm-pre-reloc;
+&usb1 {
+       status = "okay";
 };
 
-&pinctrl_uart0 {
-       u-boot,dm-pre-reloc;
+&nand {
+       status = "okay";
 };