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

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

diff --git a/arch/arm/dts/uniphier-pro4.dtsi b/arch/arm/dts/uniphier-pro4.dtsi
index 9b881f6905b07a2549ba7bf14c11ea0b1a62d357..cbb848207cc1c718ef9d5f54192d0f2393f9bb6b 100644 (file)
--- a/arch/arm/dts/uniphier-pro4.dtsi
+++ b/arch/arm/dts/uniphier-pro4.dtsi
@@ -4,13 +4,13 @@
  * Copyright (C) 2015-2016 Socionext Inc.
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  *
- * SPDX-License-Identifier:    GPL-2.0+        X11
+ * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
-/include/ "skeleton.dtsi"
-
 / {
        compatible = "socionext,uniphier-pro4";
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        cpus {
                #address-cells = <1>;
@@ -405,7 +405,7 @@
                        pinctrl-0 = <&pinctrl_system_bus>;
                };
 
-               smpctrl@59800000 {
+               smpctrl@59801000 {
                        compatible = "socionext,uniphier-smpctrl";
                        reg = <0x59801000 0x400>;
                };
@@ -587,6 +587,7 @@
                                compatible = "snps,dwc3";
                                reg = <0x65a00000 0x10000>;
                                interrupts = <0 134 4>;
+                               dr_mode = "host";
                                tx-fifo-resize;
                        };
                };
@@ -604,12 +605,13 @@
                                compatible = "snps,dwc3";
                                reg = <0x65c00000 0x10000>;
                                interrupts = <0 137 4>;
+                               dr_mode = "host";
                                tx-fifo-resize;
                        };
                };
 
                nand: nand@68000000 {
-                       compatible = "socionext,denali-nand-v5a";
+                       compatible = "socionext,uniphier-denali-nand-v5a";
                        status = "disabled";
                        reg-names = "nand_data", "denali_reg";
                        reg = <0x68000000 0x20>, <0x68100000 0x1000>;