Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cea59bd0 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 29b4817d

arch/arm64/boot/dts/socionext/Makefile

+1 −1
Original line number Diff line number Diff line 
dtb-$(CONFIG_ARCH_UNIPHIER) += uniphier-ph1-ld20-ref.dtb

dtb-$(CONFIG_ARCH_UNIPHIER) += uniphier-ld20-ref.dtb



always		:= $(dtb-y)

clean-files	:= *.dtb

arch/arm64/boot/dts/socionext/uniphier-ph1-ld20-ref.dts→arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts

+6 −5
Original line number Diff line number Diff line 
/*

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

arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi→arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi

+5 −4
Original line number Diff line number Diff line 
/*

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