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

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

diff --git a/arch/arm/dts/uniphier-sld8-ref.dts b/arch/arm/dts/uniphier-sld8-ref.dts
index 6c0544b908ed2d90e7bba91a1f731a558855e770..01bf94c6b93aeabacb954fbcf1dd1efdf02b313b 100644 (file)
--- a/arch/arm/dts/uniphier-sld8-ref.dts
+++ b/arch/arm/dts/uniphier-sld8-ref.dts
@@ -1,26 +1,19 @@
-/*
- * Device Tree Source for UniPhier sLD8 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 sLD8 Reference Board
+//
+// Copyright (C) 2015-2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 /dts-v1/;
-/include/ "uniphier-sld8.dtsi"
-/include/ "uniphier-ref-daughter.dtsi"
-/include/ "uniphier-support-card.dtsi"
+#include "uniphier-sld8.dtsi"
+#include "uniphier-ref-daughter.dtsi"
+#include "uniphier-support-card.dtsi"
 
 / {
        model = "UniPhier sLD8 Reference Board";
        compatible = "socionext,uniphier-sld8-ref", "socionext,uniphier-sld8";
 
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x20000000>;
-       };
-
        chosen {
                stdout-path = "serial0:115200n8";
        };
@@ -35,10 +28,15 @@
                i2c2 = &i2c2;
                i2c3 = &i2c3;
        };
+
+       memory@80000000 {
+               device_type = "memory";
+               reg = <0x80000000 0x20000000>;
+       };
 };
 
 &ethsc {
-       interrupts = <0 48 4>;
+       interrupts = <0 8>;
 };
 
 &serial0 {
@@ -53,6 +51,14 @@
        status = "okay";
 };
 
+&gpio {
+       xirq0 {
+               gpio-hog;
+               gpios = <UNIPHIER_GPIO_IRQ(0) 0>;
+               input;
+       };
+};
+
 &i2c0 {
        status = "okay";
 };
@@ -73,11 +79,6 @@
        status = "okay";
 };
 
-/* for U-Boot only */
-&serial0 {
-       u-boot,dm-pre-reloc;
-};
-
-&pinctrl_uart0 {
-       u-boot,dm-pre-reloc;
+&nand {
+       status = "okay";
 };