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

Commit 77896e4d authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

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

arch/arm/boot/dts/Makefile

+9 −9
Original line number Diff line number Diff line
@@ -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

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

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

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

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

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

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

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

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

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

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

+9 −8
Original line number Diff line number Diff line 
/*

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