ARM: 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/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index faacd52..1dd4722 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -836,15 +836,15 @@ dtb-$(CONFIG_ARCH_U8500) += \
        ste-ccu8540.dtb \
        ste-ccu9540.dtb
 dtb-$(CONFIG_ARCH_UNIPHIER) += \
-       uniphier-ph1-ld4-ref.dtb \
-       uniphier-ph1-ld6b-ref.dtb \
-       uniphier-ph1-pro4-ace.dtb \
-       uniphier-ph1-pro4-ref.dtb \
-       uniphier-ph1-pro4-sanji.dtb \
-       uniphier-ph1-sld3-ref.dtb \
-       uniphier-ph1-sld8-ref.dtb \
-       uniphier-proxstream2-gentil.dtb \
-       uniphier-proxstream2-vodka.dtb
+       uniphier-ld4-ref.dtb \
+       uniphier-ld6b-ref.dtb \
+       uniphier-pro4-ace.dtb \
+       uniphier-pro4-ref.dtb \
+       uniphier-pro4-sanji.dtb \
+       uniphier-pxs2-gentil.dtb \
+       uniphier-pxs2-vodka.dtb \
+       uniphier-sld3-ref.dtb \
+       uniphier-sld8-ref.dtb
 dtb-$(CONFIG_ARCH_VERSATILE) += \
        versatile-ab.dtb \
        versatile-pb.dtb

diff --git a/arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts b/arch/arm/boot/dts/uniphier-ld4-ref.dts
similarity index 89%
rename from arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts
rename to arch/arm/boot/dts/uniphier-ld4-ref.dts
index ec94b7a..110031b 100644 (file)
--- a/arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts
+++ b/arch/arm/boot/dts/uniphier-ld4-ref.dts
@@ -1,7 +1,8 @@
 /*
- * Device Tree Source for UniPhier PH1-LD4 Reference Board
+ * Device Tree Source for UniPhier LD4 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-ld4.dtsi"
+/include/ "uniphier-ld4.dtsi"
 /include/ "uniphier-ref-daughter.dtsi"
 /include/ "uniphier-support-card.dtsi"
 
 / {
-       model = "UniPhier PH1-LD4 Reference Board";
-       compatible = "socionext,ph1-ld4-ref", "socionext,ph1-ld4";
+       model = "UniPhier LD4 Reference Board";
+       compatible = "socionext,uniphier-ld4-ref", "socionext,uniphier-ld4";
 
        memory {
                device_type = "memory";

diff --git a/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi b/arch/arm/boot/dts/uniphier-ld4.dtsi
similarity index 96%
rename from arch/arm/boot/dts/uniphier-ph1-ld4.dtsi
rename to arch/arm/boot/dts/uniphier-ld4.dtsi
index debad7f..298fb38 100644 (file)
--- a/arch/arm/boot/dts/uniphier-ph1-ld4.dtsi
+++ b/arch/arm/boot/dts/uniphier-ld4.dtsi
@@ -1,7 +1,8 @@
 /*
- * Device Tree Source for UniPhier PH1-LD4 SoC
+ * Device Tree Source for UniPhier LD4 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 @@
 /include/ "uniphier-common32.dtsi"
 
 / {
-       compatible = "socionext,ph1-ld4";
+       compatible = "socionext,uniphier-ld4";
 
        cpus {
                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts b/arch/arm/boot/dts/uniphier-ld6b-ref.dts
similarity index 89%
rename from arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts
rename to arch/arm/boot/dts/uniphier-ld6b-ref.dts
index b8134c6..c05d631 100644 (file)
--- a/arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts
+++ b/arch/arm/boot/dts/uniphier-ld6b-ref.dts
@@ -1,7 +1,8 @@
 /*
- * Device Tree Source for UniPhier PH1-LD6b Reference Board
+ * Device Tree Source for UniPhier LD6b 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-ld6b.dtsi"
+/include/ "uniphier-ld6b.dtsi"
 /include/ "uniphier-ref-daughter.dtsi"
 /include/ "uniphier-support-card.dtsi"
 
 / {
-       model = "UniPhier PH1-LD6b Reference Board";
-       compatible = "socionext,ph1-ld6b-ref", "socionext,ph1-ld6b";
+       model = "UniPhier LD6b Reference Board";
+       compatible = "socionext,uniphier-ld6b-ref", "socionext,uniphier-ld6b";
 
        memory {
                device_type = "memory";

diff --git a/arch/arm/boot/dts/uniphier-ph1-ld6b.dtsi b/arch/arm/boot/dts/uniphier-ld6b.dtsi
similarity index 82%
rename from arch/arm/boot/dts/uniphier-ph1-ld6b.dtsi
rename to arch/arm/boot/dts/uniphier-ld6b.dtsi
index 19c107c..905c77d 100644 (file)
--- a/arch/arm/boot/dts/uniphier-ph1-ld6b.dtsi
+++ b/arch/arm/boot/dts/uniphier-ld6b.dtsi
@@ -1,7 +1,8 @@
 /*
- * Device Tree Source for UniPhier PH1-LD6b SoC
+ * Device Tree Source for UniPhier LD6b 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
@@ -43,14 +44,14 @@
  */
 
 /*
- * PH1-LD6b consists of two silicon dies: D-chip and A-chip.
- * The D-chip (digital chip) is the same as the ProXstream2 die.
- * Reuse the ProXstream2 device tree with some properties overridden.
+ * LD6b consists of two silicon dies: D-chip and A-chip.
+ * The D-chip (digital chip) is the same as the PXs2 die.
+ * Reuse the PXs2 device tree with some properties overridden.
  */
-/include/ "uniphier-proxstream2.dtsi"
+/include/ "uniphier-pxs2.dtsi"
 
 / {
-       compatible = "socionext,ph1-ld6b";
+       compatible = "socionext,uniphier-ld6b";
 };
 
 /* UART3 unavailable: the pads are not wired to the package balls */
@@ -59,7 +60,7 @@
 };
 
 /*
- * PH1-LD6b and ProXstream2 have completely different packages,
+ * LD6b and PXs2 have completely different packages,
  * which makes the pinctrl driver unshareable.
  */
 &pinctrl {

diff --git a/arch/arm/boot/dts/uniphier-ph1-pro4-ace.dts b/arch/arm/boot/dts/uniphier-pro4-ace.dts
similarity index 90%
rename from arch/arm/boot/dts/uniphier-ph1-pro4-ace.dts
rename to arch/arm/boot/dts/uniphier-pro4-ace.dts
index d343586..0ab0a40 100644 (file)
--- a/arch/arm/boot/dts/uniphier-ph1-pro4-ace.dts
+++ b/arch/arm/boot/dts/uniphier-pro4-ace.dts
@@ -1,7 +1,8 @@
 /*
- * Device Tree Source for UniPhier PH1-Pro4 Ace Board
+ * Device Tree Source for UniPhier Pro4 Ace Board
  *
- * Copyright (C) 2016 Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 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,11 +44,11 @@
  */
 
 /dts-v1/;
-/include/ "uniphier-ph1-pro4.dtsi"
+/include/ "uniphier-pro4.dtsi"
 
 / {
-       model = "UniPhier PH1-Pro4 Ace Board";
-       compatible = "socionext,ph1-pro4-ace", "socionext,ph1-pro4";
+       model = "UniPhier Pro4 Ace Board";
+       compatible = "socionext,uniphier-pro4-ace", "socionext,uniphier-pro4";
 
        memory {
                device_type = "memory";

diff --git a/arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts b/arch/arm/boot/dts/uniphier-pro4-ref.dts
similarity index 89%
rename from arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts
rename to arch/arm/boot/dts/uniphier-pro4-ref.dts
index 95f631a..9e92e60 100644 (file)
--- a/arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts
+++ b/arch/arm/boot/dts/uniphier-pro4-ref.dts
@@ -1,7 +1,8 @@
 /*
- * Device Tree Source for UniPhier PH1-Pro4 Reference Board
+ * Device Tree Source for UniPhier Pro4 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-pro4.dtsi"
+/include/ "uniphier-pro4.dtsi"
 /include/ "uniphier-ref-daughter.dtsi"
 /include/ "uniphier-support-card.dtsi"
 
 / {
-       model = "UniPhier PH1-Pro4 Reference Board";
-       compatible = "socionext,ph1-pro4-ref", "socionext,ph1-pro4";
+       model = "UniPhier Pro4 Reference Board";
+       compatible = "socionext,uniphier-pro4-ref", "socionext,uniphier-pro4";
 
        memory {
                device_type = "memory";

diff --git a/arch/arm/boot/dts/uniphier-ph1-pro4-sanji.dts b/arch/arm/boot/dts/uniphier-pro4-sanji.dts
similarity index 89%
rename from arch/arm/boot/dts/uniphier-ph1-pro4-sanji.dts
rename to arch/arm/boot/dts/uniphier-pro4-sanji.dts
index 7c3a1fc..dc4ea88 100644 (file)
--- a/arch/arm/boot/dts/uniphier-ph1-pro4-sanji.dts
+++ b/arch/arm/boot/dts/uniphier-pro4-sanji.dts
@@ -1,7 +1,8 @@
 /*
- * Device Tree Source for UniPhier PH1-Pro4 Sanji Board
+ * Device Tree Source for UniPhier Pro4 Sanji Board
  *
- * Copyright (C) 2016 Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 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,11 +44,11 @@
  */
 
 /dts-v1/;
-/include/ "uniphier-ph1-pro4.dtsi"
+/include/ "uniphier-pro4.dtsi"
 
 / {
-       model = "UniPhier PH1-Pro4 Sanji Board";
-       compatible = "socionext,ph1-pro4-sanji", "socionext,ph1-pro4";
+       model = "UniPhier Pro4 Sanji Board";
+       compatible = "socionext,uniphier-pro4-sanji", "socionext,uniphier-pro4";
 
        memory {
                device_type = "memory";

diff --git a/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi b/arch/arm/boot/dts/uniphier-pro4.dtsi
similarity index 96%
rename from arch/arm/boot/dts/uniphier-ph1-pro4.dtsi
rename to arch/arm/boot/dts/uniphier-pro4.dtsi
index 7b9da08..fd450f3 100644 (file)
--- a/arch/arm/boot/dts/uniphier-ph1-pro4.dtsi
+++ b/arch/arm/boot/dts/uniphier-pro4.dtsi
@@ -1,7 +1,8 @@
 /*
- * Device Tree Source for UniPhier PH1-Pro4 SoC
+ * Device Tree Source for UniPhier Pro4 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 @@
 /include/ "uniphier-common32.dtsi"
 
 / {
-       compatible = "socionext,ph1-pro4";
+       compatible = "socionext,uniphier-pro4";
 
        cpus {
                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/uniphier-ph1-pro5.dtsi b/arch/arm/boot/dts/uniphier-pro5.dtsi
similarity index 96%
rename from arch/arm/boot/dts/uniphier-ph1-pro5.dtsi
rename to arch/arm/boot/dts/uniphier-pro5.dtsi
index 7e4aa2f..9f9fd8c 100644 (file)
--- a/arch/arm/boot/dts/uniphier-ph1-pro5.dtsi
+++ b/arch/arm/boot/dts/uniphier-pro5.dtsi
@@ -1,7 +1,8 @@
 /*
- * Device Tree Source for UniPhier PH1-Pro5 SoC
+ * Device Tree Source for UniPhier Pro5 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 @@
 /include/ "uniphier-common32.dtsi"
 
 / {
-       compatible = "socionext,ph1-pro5";
+       compatible = "socionext,uniphier-pro5";
 
        cpus {
                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/uniphier-proxstream2-gentil.dts b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
similarity index 88%
rename from arch/arm/boot/dts/uniphier-proxstream2-gentil.dts
rename to arch/arm/boot/dts/uniphier-pxs2-gentil.dts
index 98d895b..373818a 100644 (file)
--- a/arch/arm/boot/dts/uniphier-proxstream2-gentil.dts
+++ b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
@@ -1,7 +1,8 @@
 /*
- * Device Tree Source for UniPhier ProXstream2 Gentil Board
+ * Device Tree Source for UniPhier PXs2 Gentil 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,11 +44,12 @@
  */
 
 /dts-v1/;
-/include/ "uniphier-proxstream2.dtsi"
+/include/ "uniphier-pxs2.dtsi"
 
 / {
-       model = "UniPhier ProXstream2 Gentil Board";
-       compatible = "socionext,proxstream2-gentil", "socionext,proxstream2";
+       model = "UniPhier PXs2 Gentil Board";
+       compatible = "socionext,uniphier-pxs2-gentil",
+                    "socionext,uniphier-pxs2";
 
        memory {
                device_type = "memory";

diff --git a/arch/arm/boot/dts/uniphier-proxstream2-vodka.dts b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
similarity index 88%
rename from arch/arm/boot/dts/uniphier-proxstream2-vodka.dts
rename to arch/arm/boot/dts/uniphier-pxs2-vodka.dts
index 1fb8bd7..51a3eac 100644 (file)
--- a/arch/arm/boot/dts/uniphier-proxstream2-vodka.dts
+++ b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
@@ -1,7 +1,8 @@
 /*
- * Device Tree Source for UniPhier ProXstream2 Vodka Board
+ * Device Tree Source for UniPhier PXs2 Vodka 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,11 +44,11 @@
  */
 
 /dts-v1/;
-/include/ "uniphier-proxstream2.dtsi"
+/include/ "uniphier-pxs2.dtsi"
 
 / {
-       model = "UniPhier ProXstream2 Vodka Board";
-       compatible = "socionext,proxstream2-vodka", "socionext,proxstream2";
+       model = "UniPhier PXs2 Vodka Board";
+       compatible = "socionext,uniphier-pxs2-vodka", "socionext,uniphier-pxs2";
 
        memory {
                device_type = "memory";

diff --git a/arch/arm/boot/dts/uniphier-proxstream2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi
similarity index 96%
rename from arch/arm/boot/dts/uniphier-proxstream2.dtsi
rename to arch/arm/boot/dts/uniphier-pxs2.dtsi
index d00d6f5..6d702d2 100644 (file)
--- a/arch/arm/boot/dts/uniphier-proxstream2.dtsi
+++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi
@@ -1,7 +1,8 @@
 /*
- * Device Tree Source for UniPhier ProXstream2 SoC
+ * Device Tree Source for UniPhier PXs2 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 @@
 /include/ "uniphier-common32.dtsi"
 
 / {
-       compatible = "socionext,proxstream2";
+       compatible = "socionext,uniphier-pxs2";
 
        cpus {
                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts b/arch/arm/boot/dts/uniphier-sld3-ref.dts
similarity index 89%
rename from arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts
rename to arch/arm/boot/dts/uniphier-sld3-ref.dts
index acb4204..ac792ae 100644 (file)
--- a/arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts
+++ b/arch/arm/boot/dts/uniphier-sld3-ref.dts
@@ -1,7 +1,8 @@
 /*
- * Device Tree Source for UniPhier PH1-sLD3 Reference Board
+ * Device Tree Source for UniPhier sLD3 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-sld3.dtsi"
+/include/ "uniphier-sld3.dtsi"
 /include/ "uniphier-ref-daughter.dtsi"
 /include/ "uniphier-support-card.dtsi"
 
 / {
-       model = "UniPhier PH1-sLD3 Reference Board";
-       compatible = "socionext,ph1-sld3-ref", "socionext,ph1-sld3";
+       model = "UniPhier sLD3 Reference Board";
+       compatible = "socionext,uniphier-sld3-ref", "socionext,uniphier-sld3";
 
        memory {
                device_type = "memory";

diff --git a/arch/arm/boot/dts/uniphier-ph1-sld3.dtsi b/arch/arm/boot/dts/uniphier-sld3.dtsi
similarity index 97%
rename from arch/arm/boot/dts/uniphier-ph1-sld3.dtsi
rename to arch/arm/boot/dts/uniphier-sld3.dtsi
index 03292f4..f33caf4 100644 (file)
--- a/arch/arm/boot/dts/uniphier-ph1-sld3.dtsi
+++ b/arch/arm/boot/dts/uniphier-sld3.dtsi
@@ -1,7 +1,8 @@
 /*
- * Device Tree Source for UniPhier PH1-sLD3 SoC
+ * Device Tree Source for UniPhier sLD3 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 @@
 /include/ "skeleton.dtsi"
 
 / {
-       compatible = "socionext,ph1-sld3";
+       compatible = "socionext,uniphier-sld3";
 
        cpus {
                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts b/arch/arm/boot/dts/uniphier-sld8-ref.dts
similarity index 89%
rename from arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts
rename to arch/arm/boot/dts/uniphier-sld8-ref.dts
index d594f40..a8291f9 100644 (file)
--- a/arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts
+++ b/arch/arm/boot/dts/uniphier-sld8-ref.dts
@@ -1,7 +1,8 @@
 /*
- * Device Tree Source for UniPhier PH1-sLD8 Reference Board
+ * Device Tree Source for UniPhier sLD8 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-sld8.dtsi"
+/include/ "uniphier-sld8.dtsi"
 /include/ "uniphier-ref-daughter.dtsi"
 /include/ "uniphier-support-card.dtsi"
 
 / {
-       model = "UniPhier PH1-sLD8 Reference Board";
-       compatible = "socionext,ph1-sld8-ref", "socionext,ph1-sld8";
+       model = "UniPhier sLD8 Reference Board";
+       compatible = "socionext,uniphier-sld8-ref", "socionext,uniphier-sld8";
 
        memory {
                device_type = "memory";

diff --git a/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi b/arch/arm/boot/dts/uniphier-sld8.dtsi
similarity index 96%
rename from arch/arm/boot/dts/uniphier-ph1-sld8.dtsi
rename to arch/arm/boot/dts/uniphier-sld8.dtsi
index 467f9d8..8bab1df 100644 (file)
--- a/arch/arm/boot/dts/uniphier-ph1-sld8.dtsi
+++ b/arch/arm/boot/dts/uniphier-sld8.dtsi
@@ -1,7 +1,8 @@
 /*
- * Device Tree Source for UniPhier PH1-sLD8 SoC
+ * Device Tree Source for UniPhier sLD8 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 @@
 /include/ "uniphier-common32.dtsi"
 
 / {
-       compatible = "socionext,ph1-sld8";
+       compatible = "socionext,uniphier-sld8";
 
        cpus {
                #address-cells = <1>;