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

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

diff --git a/arch/arm/dts/uniphier-ph1-pro4-ref.dts b/arch/arm/dts/uniphier-ph1-pro4-ref.dts
index d9e7a8c52b8c7445e52e3f6c112b099bb2b0ed79..f6d03e3e26ce62afb1cabc94279b7c466e9fbcb7 100644 (file)
--- a/arch/arm/dts/uniphier-ph1-pro4-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-pro4-ref.dts
@@ -2,7 +2,8 @@
  * Device Tree Source for UniPhier PH1-Pro4 Reference Board
  *
  * Copyright (C) 2014-2015 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2015      Socionext Inc.
+ *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
@@ -12,8 +13,8 @@
 /include/ "uniphier-ref-daughter.dtsi"
 
 / {
-       model = "Panasonic UniPhier PH1-Pro4 Reference Board";
-       compatible = "panasonic,ph1-pro4-ref", "panasonic,ph1-pro4";
+       model = "UniPhier PH1-Pro4 Reference Board";
+       compatible = "socionext,ph1-pro4-ref", "socionext,ph1-pro4";
 
        memory {
                device_type = "memory";
@@ -36,6 +37,7 @@
                i2c3 = &i2c3;
                i2c5 = &i2c5;
                i2c6 = &i2c6;
+               usb0 = &usb0;
        };
 };
 
@@ -54,7 +56,3 @@
 &usb0 {
        status = "okay";
 };
-
-&usb1 {
-       status = "okay";
-};