korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-03 17:14:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Masahiro Yamada 2016-08-30 14:02:41 +09:00
parent 9a58485ebc
commit 77896e4d05
17 changed files with 97 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm/boot/dts/Makefile
View File

@ -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

11
arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts → arch/arm/boot/dts/uniphier-ld4-ref.dts
View File

@ -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";

7
arch/arm/boot/dts/uniphier-ph1-ld4.dtsi → arch/arm/boot/dts/uniphier-ld4.dtsi
View File

@ -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>;

11
arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts → arch/arm/boot/dts/uniphier-ld6b-ref.dts
View File

@ -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";

17
arch/arm/boot/dts/uniphier-ph1-ld6b.dtsi → arch/arm/boot/dts/uniphier-ld6b.dtsi
View File

@ -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 {

11
arch/arm/boot/dts/uniphier-ph1-pro4-ace.dts → arch/arm/boot/dts/uniphier-pro4-ace.dts
View File

@ -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";

11
arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts → arch/arm/boot/dts/uniphier-pro4-ref.dts
View File

@ -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";

11
arch/arm/boot/dts/uniphier-ph1-pro4-sanji.dts → arch/arm/boot/dts/uniphier-pro4-sanji.dts
View File

@ -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";

7
arch/arm/boot/dts/uniphier-ph1-pro4.dtsi → arch/arm/boot/dts/uniphier-pro4.dtsi
View File

@ -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>;

7
arch/arm/boot/dts/uniphier-ph1-pro5.dtsi → arch/arm/boot/dts/uniphier-pro5.dtsi
View File

@ -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>;

12
arch/arm/boot/dts/uniphier-proxstream2-gentil.dts → arch/arm/boot/dts/uniphier-pxs2-gentil.dts
View File

@ -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";

11
arch/arm/boot/dts/uniphier-proxstream2-vodka.dts → arch/arm/boot/dts/uniphier-pxs2-vodka.dts
View File

@ -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";

7
arch/arm/boot/dts/uniphier-proxstream2.dtsi → arch/arm/boot/dts/uniphier-pxs2.dtsi
View File

@ -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>;

11
arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts → arch/arm/boot/dts/uniphier-sld3-ref.dts
View File

@ -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";

7
arch/arm/boot/dts/uniphier-ph1-sld3.dtsi → arch/arm/boot/dts/uniphier-sld3.dtsi
View File

@ -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>;

11
arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts → arch/arm/boot/dts/uniphier-sld8-ref.dts
View File

@ -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";

7
arch/arm/boot/dts/uniphier-ph1-sld8.dtsi → arch/arm/boot/dts/uniphier-sld8.dtsi
View File

@ -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>;