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

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

diff --git a/arch/arm/dts/uniphier-pxs3-ref.dts b/arch/arm/dts/uniphier-pxs3-ref.dts
index 27f0cb08b93a40fc697b32b5bc6a2c6f7a5da7e6..f5496100ac0fe2c229ab67e6b2ba0292f8c3c7ad 100644 (file)
--- a/arch/arm/dts/uniphier-pxs3-ref.dts
+++ b/arch/arm/dts/uniphier-pxs3-ref.dts
@@ -4,18 +4,21 @@
  * Copyright (C) 2017 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-pxs3.dtsi"
-/include/ "uniphier-ref-daughter.dtsi"
-/include/ "uniphier-support-card.dtsi"
+#include "uniphier-pxs3.dtsi"
+#include "uniphier-support-card.dtsi"
 
 / {
        model = "UniPhier PXs3 Reference Board";
        compatible = "socionext,uniphier-pxs3-ref", "socionext,uniphier-pxs3";
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        aliases {
                serial0 = &serial0;
                serial1 = &serial1;
@@ -28,24 +31,52 @@
                i2c6 = &i2c6;
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0 0x80000000 0 0xa0000000>;
        };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
 };
 
 &ethsc {
-       interrupts = <0 48 4>;
+       interrupts = <4 8>;
 };
 
 &serial0 {
        status = "okay";
 };
 
+&gpio {
+       xirq4 {
+               gpio-hog;
+               gpios = <UNIPHIER_GPIO_IRQ(4) 0>;
+               input;
+       };
+};
+
 &i2c0 {
        status = "okay";
 };
+
+&i2c1 {
+       status = "okay";
+};
+
+&i2c2 {
+       status = "okay";
+};
+
+&i2c3 {
+       status = "okay";
+};
+
+&usb0 {
+       status = "okay";
+};
+
+&usb1 {
+       status = "okay";
+};
+
+&nand {
+       status = "okay";
+};