Merge git://git.denx.de/u-boot-sh

[u-boot] / 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 2d49b3e831ad6c52c1aa9904dd7d80ef1e21278b..13e1b3ec882898a9c5f3513e0474588680ef1dcb 100644 (file)
--- a/arch/arm/dts/uniphier-pro4-ref.dts
+++ b/arch/arm/dts/uniphier-pro4-ref.dts
@@ -4,7 +4,7 @@
  * 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/;
@@ -16,11 +16,6 @@
        model = "UniPhier Pro4 Reference Board";
        compatible = "socionext,uniphier-pro4-ref", "socionext,uniphier-pro4";
 
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x40000000>;
-       };
-
        chosen {
                stdout-path = "serial0:115200n8";
        };
@@ -38,6 +33,11 @@
                i2c6 = &i2c6;
                usb0 = &usb0;
        };
+
+       memory@80000000 {
+               device_type = "memory";
+               reg = <0x80000000 0x40000000>;
+       };
 };
 
 &ethsc {
@@ -68,15 +68,19 @@
        status = "okay";
 };
 
-&usb0 {
+&usb2 {
        status = "okay";
 };
 
-&usb2 {
+&usb3 {
        status = "okay";
 };
 
-&usb3 {
+&usb0 {
+       status = "okay";
+};
+
+&usb1 {
        status = "okay";
 };