Skip to content

Commit

Permalink
arm64: dts: uniphier: match DT names to other projects and documents
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
masahir0y committed Aug 30, 2016
1 parent 29b4817 commit cea59bd
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/socionext/Makefile
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
* Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <[email protected]>
*
* 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
Expand Down Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/*
* Device Tree Source for UniPhier PH1-LD20 SoC
* Device Tree Source for UniPhier LD20 SoC
*
* Copyright (C) 2015 Masahiro Yamada <[email protected]>
* Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <[email protected]>
*
* 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
Expand Down Expand Up @@ -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>;
Expand Down Expand Up @@ -271,7 +272,7 @@
reg = <0x5f800000 0x2000>;

pinctrl: pinctrl {
compatible = "socionext,uniphier-ld20-pinctrl";
compatible = "socionext,uniphier-ld20-pinctrl";
};
};

Expand Down

0 comments on commit cea59bd

Please sign in to comment.