arm64: dts: uniphier: match DT names to other projects and documents

All UniPhier device trees have the common prefix "uniphier-", so
"ph1-" is just making names longer.  Recent documents and other
projects are not using PH1- prefixes any more.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm64/boot/dts/socionext/Makefile b/arch/arm64/boot/dts/socionext/Makefile
index 299b67ec4d4499d6fb4a4185caf67a722dfb5168..26685b113119181f08d22bdbd284d4d442b9d89b 100644 (file)
--- a/arch/arm64/boot/dts/socionext/Makefile
+++ b/arch/arm64/boot/dts/socionext/Makefile
@@ -1,4 +1,4 @@
-dtb-$(CONFIG_ARCH_UNIPHIER) += uniphier-ph1-ld20-ref.dtb
+dtb-$(CONFIG_ARCH_UNIPHIER) += uniphier-ld20-ref.dtb
 
 always         := $(dtb-y)
 clean-files    := *.dtb

diff --git a/arch/arm64/boot/dts/socionext/uniphier-ph1-ld20-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
similarity index 89%
rename from arch/arm64/boot/dts/socionext/uniphier-ph1-ld20-ref.dts
rename to arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
index 2adad8c8cd2743b33616644b27b6b12d7b32a418..609162a1a322445e1f11a8c45a43719f1a6b0c21 100644 (file)
--- a/arch/arm64/boot/dts/socionext/uniphier-ph1-ld20-ref.dts
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
@@ -1,7 +1,8 @@
 /*
- * Device Tree Source for UniPhier PH1-LD20 Reference Board
+ * Device Tree Source for UniPhier LD20 Reference Board
  *
- * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2015-2016 Socionext Inc.
+ *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * 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
@@ -43,13 +44,13 @@
  */
 
 /dts-v1/;
-/include/ "uniphier-ph1-ld20.dtsi"
+/include/ "uniphier-ld20.dtsi"
 /include/ "uniphier-ref-daughter.dtsi"
 /include/ "uniphier-support-card.dtsi"
 
 / {
-       model = "UniPhier PH1-LD20 Reference Board";
-       compatible = "socionext,ph1-ld20-ref", "socionext,ph1-ld20";
+       model = "UniPhier LD20 Reference Board";
+       compatible = "socionext,uniphier-ld20-ref", "socionext,uniphier-ld20";
 
        memory {
                device_type = "memory";

diff --git a/arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
similarity index 96%
rename from arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi
rename to arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
index c223915f0907df01b095e3d0ccc1cdbb41a44e39..dc6577f576886660700c8ae401cd3ef85a4225b0 100644 (file)
--- a/arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
@@ -1,7 +1,8 @@
 /*
- * Device Tree Source for UniPhier PH1-LD20 SoC
+ * Device Tree Source for UniPhier LD20 SoC
  *
- * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2015-2016 Socionext Inc.
+ *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * 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
@@ -45,7 +46,7 @@
 /memreserve/ 0x80000000 0x00000008;    /* cpu-release-addr */
 
 / {
-       compatible = "socionext,ph1-ld20";
+       compatible = "socionext,uniphier-ld20";
        #address-cells = <2>;
        #size-cells = <2>;
        interrupt-parent = <&gic>;
@@ -271,7 +272,7 @@ soc-glue@5f800000 {
                        reg = <0x5f800000 0x2000>;
 
                        pinctrl: pinctrl {
-                                compatible = "socionext,uniphier-ld20-pinctrl";
+                               compatible = "socionext,uniphier-ld20-pinctrl";
                        };
                };