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

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

diff --git a/arch/arm/dts/uniphier-ph1-pro4.dtsi b/arch/arm/dts/uniphier-ph1-pro4.dtsi
index dd84269d1ade467c95ba95c986cae194b40e52d5..8195266db3c7ab2f88b459af41d331ae40fad105 100644 (file)
--- a/arch/arm/dts/uniphier-ph1-pro4.dtsi
+++ b/arch/arm/dts/uniphier-ph1-pro4.dtsi
@@ -1,8 +1,9 @@
 /*
  * Device Tree Source for UniPhier PH1-Pro4 SoC
  *
- * 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+
  */
@@ -10,11 +11,11 @@
 /include/ "skeleton.dtsi"
 
 / {
-       compatible = "panasonic,ph1-pro4";
+       compatible = "socionext,ph1-pro4";
 
        cpus {
-               #size-cells = <0>;
                #address-cells = <1>;
+               #size-cells = <0>;
 
                cpu@0 {
                        device_type = "cpu";
@@ -36,43 +37,117 @@
                ranges;
 
                uart0: serial@54006800 {
-                       compatible = "panasonic,uniphier-uart";
+                       compatible = "socionext,uniphier-uart";
                        status = "disabled";
                        reg = <0x54006800 0x20>;
                        clock-frequency = <73728000>;
                };
 
                uart1: serial@54006900 {
-                       compatible = "panasonic,uniphier-uart";
+                       compatible = "socionext,uniphier-uart";
                        status = "disabled";
                        reg = <0x54006900 0x20>;
                        clock-frequency = <73728000>;
                };
 
                uart2: serial@54006a00 {
-                       compatible = "panasonic,uniphier-uart";
+                       compatible = "socionext,uniphier-uart";
                        status = "disabled";
                        reg = <0x54006a00 0x20>;
                        clock-frequency = <73728000>;
                };
 
                uart3: serial@54006b00 {
-                       compatible = "panasonic,uniphier-uart";
+                       compatible = "socionext,uniphier-uart";
                        status = "disabled";
                        reg = <0x54006b00 0x20>;
                        clock-frequency = <73728000>;
                };
 
-               usb0: usb@5a800100 {
-                       compatible = "panasonic,uniphier-ehci", "usb-ehci";
+               i2c0: i2c@58780000 {
+                       compatible = "socionext,uniphier-fi2c";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x58780000 0x80>;
+                       clock-frequency = <100000>;
+                       status = "disabled";
+               };
+
+               i2c1: i2c@58781000 {
+                       compatible = "socionext,uniphier-fi2c";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x58781000 0x80>;
+                       clock-frequency = <100000>;
+                       status = "disabled";
+               };
+
+               i2c2: i2c@58782000 {
+                       compatible = "socionext,uniphier-fi2c";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x58782000 0x80>;
+                       clock-frequency = <100000>;
+                       status = "disabled";
+               };
+
+               i2c3: i2c@58783000 {
+                       compatible = "socionext,uniphier-fi2c";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x58783000 0x80>;
+                       clock-frequency = <100000>;
+                       status = "disabled";
+               };
+
+               /* i2c4 does not exist */
+
+               i2c5: i2c@58785000 {
+                       compatible = "socionext,uniphier-fi2c";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x58785000 0x80>;
+                       clock-frequency = <400000>;
+                       status = "ok";
+               };
+
+               i2c6: i2c@58786000 {
+                       compatible = "socionext,uniphier-fi2c";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x58786000 0x80>;
+                       clock-frequency = <400000>;
+                       status = "ok";
+               };
+
+               usb2: usb@5a800100 {
+                       compatible = "socionext,uniphier-ehci", "generic-ehci";
                        status = "disabled";
                        reg = <0x5a800100 0x100>;
                };
 
-               usb1: usb@5a810100 {
-                       compatible = "panasonic,uniphier-ehci", "usb-ehci";
+               usb3: usb@5a810100 {
+                       compatible = "socionext,uniphier-ehci", "generic-ehci";
                        status = "disabled";
                        reg = <0x5a810100 0x100>;
                };
+
+               usb0: usb@65a00000 {
+                       compatible = "socionext,uniphier-xhci", "generic-xhci";
+                       status = "disabled";
+                       reg = <0x65a00000 0x100>;
+               };
+
+               usb1: usb@65c00000 {
+                       compatible = "socionext,uniphier-xhci", "generic-xhci";
+                       status = "disabled";
+                       reg = <0x65c00000 0x100>;
+               };
+
+               nand: nand@68000000 {
+                       compatible = "denali,denali-nand-dt";
+                       reg = <0x68000000 0x20>, <0x68100000 0x1000>;
+                       reg-names = "nand_data", "denali_reg";
+               };
        };
 };