Merge branch 'master' of http://git.denx.de/u-boot-sunxi

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

diff --git a/arch/arm/dts/uniphier-ph1-ld4-ref.dts b/arch/arm/dts/uniphier-ph1-ld4-ref.dts
index d479be1d4d6ebdf155915be5ad8d125bf0e419bb..36de7e3a0f9680c1cec5b6abc52e8df69727080f 100644 (file)
--- a/arch/arm/dts/uniphier-ph1-ld4-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-ld4-ref.dts
@@ -1,19 +1,19 @@
 /*
  * Device Tree Source for UniPhier PH1-LD4 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/;
 /include/ "uniphier-ph1-ld4.dtsi"
 /include/ "uniphier-ref-daughter.dtsi"
+/include/ "uniphier-support-card.dtsi"
 
 / {
-       model = "Panasonic UniPhier PH1-LD4 Reference Board";
-       compatible = "panasonic,ph1-ld4-ref", "panasonic,ph1-ld4";
+       model = "UniPhier PH1-LD4 Reference Board";
+       compatible = "socionext,ph1-ld4-ref", "socionext,ph1-ld4";
 
        memory {
                device_type = "memory";
@@ -21,15 +21,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 +36,19 @@
        };
 };
 
-&uart0 {
+&ethsc {
+       interrupts = <0 49 4>;
+};
+
+&serial0 {
+       status = "okay";
+};
+
+&serial2 {
        status = "okay";
 };
 
-&uart1 {
+&serial3 {
        status = "okay";
 };
 
@@ -49,6 +56,10 @@
        status = "okay";
 };
 
+&sd {
+       status = "okay";
+};
+
 &usb0 {
        status = "okay";
 };
@@ -56,3 +67,12 @@
 &usb1 {
        status = "okay";
 };
+
+/* for U-Boot only */
+&serial0 {
+       u-boot,dm-pre-reloc;
+};
+
+&pinctrl_uart0 {
+       u-boot,dm-pre-reloc;
+};