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

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

diff --git a/arch/arm/dts/uniphier-ph1-sld3-ref.dts b/arch/arm/dts/uniphier-ph1-sld3-ref.dts
index 91b4dbe0b1b00c863a8a62016cb57c6ff4e8f7d9..d9616f68a081705a7aeb346524f71cb31e6f7245 100644 (file)
--- a/arch/arm/dts/uniphier-ph1-sld3-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-sld3-ref.dts
@@ -1,18 +1,20 @@
 /*
  * Device Tree Source for UniPhier PH1-sLD3 Reference Board
  *
- * Copyright (C) 2014 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2014-2015 Panasonic Corporation
+ * Copyright (C) 2015      Socionext Inc.
+ *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /dts-v1/;
 /include/ "uniphier-ph1-sld3.dtsi"
+/include/ "uniphier-ref-daughter.dtsi"
 
 / {
-       model = "Panasonic UniPhier PH1-sLD3 Reference Board";
-       compatible = "panasonic,ph1-sld3-ref", "panasonic,ph1-sld3";
+       model = "UniPhier PH1-sLD3 Reference Board";
+       compatible = "socionext,ph1-sld3-ref", "socionext,ph1-sld3";
 
        memory {
                device_type = "memory";
@@ -25,9 +27,9 @@
        };
 
        aliases {
-               uart0 = &uart0;
-               uart1 = &uart1;
-               uart2 = &uart2;
+               serial0 = &uart0;
+               serial1 = &uart1;
+               serial2 = &uart2;
                i2c0 = &i2c0;
                i2c1 = &i2c1;
                i2c2 = &i2c2;
@@ -45,10 +47,6 @@
 
 &i2c0 {
        status = "okay";
-       eeprom {
-               compatible = "i2c-eeprom";
-               reg = <0x50>;
-       };
 };
 
 &usb0 {