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

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

diff --git a/arch/arm/dts/uniphier-pro5.dtsi b/arch/arm/dts/uniphier-pro5.dtsi
index 68866e16df8e502cb050ed71c012e3f5e68eec99..2c8558cb4d87027fac3b1face7e6e48d0ff1951f 100644 (file)
--- a/arch/arm/dts/uniphier-pro5.dtsi
+++ b/arch/arm/dts/uniphier-pro5.dtsi
@@ -4,13 +4,49 @@
  * Copyright (C) 2015-2016 Socionext Inc.
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  *
- * SPDX-License-Identifier:    GPL-2.0+        X11
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/include/ "skeleton.dtsi"
-
 / {
        compatible = "socionext,uniphier-pro5";
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        cpus {
                #address-cells = <1>;
@@ -41,67 +77,67 @@
                compatible = "operating-points-v2";
                opp-shared;
 
-               opp@100000000 {
+               opp-100000000 {
                        opp-hz = /bits/ 64 <100000000>;
                        clock-latency-ns = <300>;
                };
-               opp@116667000 {
+               opp-116667000 {
                        opp-hz = /bits/ 64 <116667000>;
                        clock-latency-ns = <300>;
                };
-               opp@150000000 {
+               opp-150000000 {
                        opp-hz = /bits/ 64 <150000000>;
                        clock-latency-ns = <300>;
                };
-               opp@175000000 {
+               opp-175000000 {
                        opp-hz = /bits/ 64 <175000000>;
                        clock-latency-ns = <300>;
                };
-               opp@200000000 {
+               opp-200000000 {
                        opp-hz = /bits/ 64 <200000000>;
                        clock-latency-ns = <300>;
                };
-               opp@233334000 {
+               opp-233334000 {
                        opp-hz = /bits/ 64 <233334000>;
                        clock-latency-ns = <300>;
                };
-               opp@300000000 {
+               opp-300000000 {
                        opp-hz = /bits/ 64 <300000000>;
                        clock-latency-ns = <300>;
                };
-               opp@350000000 {
+               opp-350000000 {
                        opp-hz = /bits/ 64 <350000000>;
                        clock-latency-ns = <300>;
                };
-               opp@400000000 {
+               opp-400000000 {
                        opp-hz = /bits/ 64 <400000000>;
                        clock-latency-ns = <300>;
                };
-               opp@466667000 {
+               opp-466667000 {
                        opp-hz = /bits/ 64 <466667000>;
                        clock-latency-ns = <300>;
                };
-               opp@600000000 {
+               opp-600000000 {
                        opp-hz = /bits/ 64 <600000000>;
                        clock-latency-ns = <300>;
                };
-               opp@700000000 {
+               opp-700000000 {
                        opp-hz = /bits/ 64 <700000000>;
                        clock-latency-ns = <300>;
                };
-               opp@800000000 {
+               opp-800000000 {
                        opp-hz = /bits/ 64 <800000000>;
                        clock-latency-ns = <300>;
                };
-               opp@933334000 {
+               opp-933334000 {
                        opp-hz = /bits/ 64 <933334000>;
                        clock-latency-ns = <300>;
                };
-               opp@1200000000 {
+               opp-1200000000 {
                        opp-hz = /bits/ 64 <1200000000>;
                        clock-latency-ns = <300>;
                };
-               opp@1400000000 {
+               opp-1400000000 {
                        opp-hz = /bits/ 64 <1400000000>;
                        clock-latency-ns = <300>;
                };
@@ -620,7 +656,7 @@
                };
 
                nand: nand@68000000 {
-                       compatible = "socionext,denali-nand-v5b";
+                       compatible = "socionext,uniphier-denali-nand-v5b";
                        status = "disabled";
                        reg-names = "nand_data", "denali_reg";
                        reg = <0x68000000 0x20>, <0x68100000 0x1000>;