ARM: DTS: Re-sync logicpd-som-lv with Linux 4.16-rc3

[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 920fd5468f7db6b3eee587a26c9b201cbf7b857e..3f9ce6d3dd16cce8dfabd70709492554d7bd24cb 100644 (file)
--- a/arch/arm/dts/uniphier-pro4-ref.dts
+++ b/arch/arm/dts/uniphier-pro4-ref.dts
@@ -4,13 +4,13 @@
  * 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)
  */
 
 /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";
@@ -34,14 +34,14 @@
                usb0 = &usb0;
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x40000000>;
        };
 };
 
 &ethsc {
-       interrupts = <0 50 4>;
+       interrupts = <2 8>;
 };
 
 &serial0 {
@@ -56,6 +56,14 @@
        status = "okay";
 };
 
+&gpio {
+       xirq2 {
+               gpio-hog;
+               gpios = <UNIPHIER_GPIO_IRQ(2) 0>;
+               input;
+       };
+};
+
 &i2c0 {
        status = "okay";
 };
@@ -83,12 +91,3 @@
 &usb1 {
        status = "okay";
 };
-
-/* for U-Boot only */
-&serial0 {
-       u-boot,dm-pre-reloc;
-};
-
-&pinctrl_uart0 {
-       u-boot,dm-pre-reloc;
-};