Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

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

diff --git a/arch/arm/dts/uniphier-ph1-sld8-ref.dts b/arch/arm/dts/uniphier-ph1-sld8-ref.dts
index 0cb9c47b6570b71e8ee96c69aa7f9b1cd9c973a3..b5b6f65d3697d65667ffb0a6a9b18eae0d6fd357 100644 (file)
--- a/arch/arm/dts/uniphier-ph1-sld8-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-sld8-ref.dts
@@ -1,10 +1,9 @@
 /*
  * Device Tree Source for UniPhier PH1-sLD8 Reference Board
  *
- * Copyright (C) 2014-2015 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
- * SPDX-License-Identifier:    GPL-2.0+
+ * SPDX-License-Identifier:    GPL-2.0+        X11
  */
 
 /dts-v1/;
@@ -12,8 +11,8 @@
 /include/ "uniphier-ref-daughter.dtsi"
 
 / {
-       model = "Panasonic UniPhier PH1-sLD8 Reference Board";
-       compatible = "panasonic,ph1-sld8-ref", "panasonic,ph1-sld8";
+       model = "UniPhier PH1-sLD8 Reference Board";
+       compatible = "socionext,ph1-sld8-ref", "socionext,ph1-sld8";
 
        memory {
                device_type = "memory";
@@ -21,15 +20,14 @@
        };
 
        chosen {
-               bootargs = "console=ttyPS0,115200 earlyprintk";
-               stdout-path = &uart0;
+               stdout-path = "serial0:115200n8";
        };
 
        aliases {
-               serial0 = &uart0;
-               serial1 = &uart1;
-               serial2 = &uart2;
-               serial3 = &uart3;
+               serial0 = &serial0;
+               serial1 = &serial1;
+               serial2 = &serial2;
+               serial3 = &serial3;
                i2c0 = &i2c0;
                i2c1 = &i2c1;
                i2c2 = &i2c2;
@@ -37,11 +35,15 @@
        };
 };
 
-&uart0 {
+&serial0 {
        status = "okay";
 };
 
-&uart1 {
+&serial2 {
+       status = "okay";
+};
+
+&serial3 {
        status = "okay";
 };
 
@@ -56,3 +58,26 @@
 &usb1 {
        status = "okay";
 };
+
+&usb2 {
+       status = "okay";
+};
+
+/* for U-Boot only */
+/ {
+       soc {
+               u-boot,dm-pre-reloc;
+       };
+};
+
+&serial0 {
+       u-boot,dm-pre-reloc;
+};
+
+&pinctrl {
+       u-boot,dm-pre-reloc;
+};
+
+&pinctrl_uart0 {
+       u-boot,dm-pre-reloc;
+};