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

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

diff --git a/arch/arm/dts/uniphier-ld4-ref.dts b/arch/arm/dts/uniphier-ld4-ref.dts
index 0f50acb24c2c2474f334d18520111bf49ecae7e8..3aaca10f6644ab25f739403ae4550105b40763c3 100644 (file)
--- a/arch/arm/dts/uniphier-ld4-ref.dts
+++ b/arch/arm/dts/uniphier-ld4-ref.dts
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier LD4 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 LD4 Reference Board
+//
+// Copyright (C) 2015-2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 /dts-v1/;
 #include "uniphier-ld4.dtsi"
@@ -38,7 +36,7 @@
 };
 
 &ethsc {
-       interrupts = <0 49 4>;
+       interrupts = <1 8>;
 };
 
 &serial0 {
@@ -53,6 +51,14 @@
        status = "okay";
 };
 
+&gpio {
+       xirq1 {
+               gpio-hog;
+               gpios = <UNIPHIER_GPIO_IRQ(1) 0>;
+               input;
+       };
+};
+
 &i2c0 {
        status = "okay";
 };
@@ -69,11 +75,6 @@
        status = "okay";
 };
 
-/* for U-Boot only */
-&serial0 {
-       u-boot,dm-pre-reloc;
-};
-
-&pinctrl_uart0 {
-       u-boot,dm-pre-reloc;
+&nand {
+       status = "okay";
 };