ARM: dts: uniphier: sync with Linux

[u-boot] / arch / arm / dts / uniphier-ld11-ref.dts

diff --git a/arch/arm/dts/uniphier-ld11-ref.dts b/arch/arm/dts/uniphier-ld11-ref.dts
index ea1119897682378e3fa442c5638ce1ca01043c82..ffb473ad2e0fdbad76e43e50ddcaf3eb32f30c72 100644 (file)
--- a/arch/arm/dts/uniphier-ld11-ref.dts
+++ b/arch/arm/dts/uniphier-ld11-ref.dts
@@ -4,18 +4,22 @@
  * Copyright (C) 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-ld11.dtsi"
-/include/ "uniphier-ref-daughter.dtsi"
-/include/ "uniphier-support-card.dtsi"
+#include "uniphier-ld11.dtsi"
+#include "uniphier-ref-daughter.dtsi"
+#include "uniphier-support-card.dtsi"
 
 / {
        model = "UniPhier LD11 Reference Board";
        compatible = "socionext,uniphier-ld11-ref", "socionext,uniphier-ld11";
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        aliases {
                serial0 = &serial0;
                serial1 = &serial1;
@@ -29,14 +33,10 @@
                i2c5 = &i2c5;
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0 0x80000000 0 0x40000000>;
        };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
 };
 
 &ethsc {
@@ -62,16 +62,3 @@
 &usb2 {
        status = "okay";
 };
-
-/* for U-Boot only */
-&serial0 {
-       u-boot,dm-pre-reloc;
-};
-
-&pinctrl_uart0 {
-       u-boot,dm-pre-reloc;
-};
-
-&pinctrl_system_bus {
-       u-boot,dm-pre-reloc;
-};