Commit 052e99db authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

arm64: dts: renesas: Rename r8a7795{-es1,}* to r8a7795[01]* 



Despite using the same compatible values ("r8a7795"-based) because of
historical reasons, R-Car H3 ES1.x (R8A77950) and R-Car H3 ES2.0+
(R8A77951) are really different SoCs, with different part numbers.

Reflect this in the DTS files by changing their base names from
"r8a7795-es1" and "r8a7795" to "r8a77950" resp. "r8a77951".
Drop all "ES" references next to part numbers, as they are implied by
the part numbers, and thus redundant.

Note that DT binding headers, definitions, and compatible values are
not renamed, to preserve backward compatibility.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Tested-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Link: https://lore.kernel.org/r/20191217183841.432-2-geert+renesas@glider.be
parent ae56c940

arch/arm64/boot/dts/renesas/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n.dtb 
dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n-ex.dtb

dtb-$(CONFIG_ARCH_R8A774C0) += r8a774c0-cat874.dtb r8a774c0-ek874.dtb \

			       r8a774c0-ek874-idk-2121wr.dtb

dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-x.dtb r8a7795-h3ulcb.dtb

dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-h3ulcb-kf.dtb

dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-xs.dtb

dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-salvator-x.dtb r8a7795-es1-h3ulcb.dtb

dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-h3ulcb-kf.dtb

dtb-$(CONFIG_ARCH_R8A7795) += r8a77951-salvator-x.dtb r8a77951-h3ulcb.dtb

dtb-$(CONFIG_ARCH_R8A7795) += r8a77951-h3ulcb-kf.dtb

dtb-$(CONFIG_ARCH_R8A7795) += r8a77951-salvator-xs.dtb

dtb-$(CONFIG_ARCH_R8A7795) += r8a77950-salvator-x.dtb r8a77950-h3ulcb.dtb

dtb-$(CONFIG_ARCH_R8A7795) += r8a77950-h3ulcb-kf.dtb

dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-salvator-x.dtb r8a77960-m3ulcb.dtb

dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-m3ulcb-kf.dtb

dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-salvator-xs.dtb

arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts→arch/arm64/boot/dts/renesas/r8a77950-h3ulcb-kf.dts

+2 −2
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ 
 * Copyright (C) 2017 Cogent Embedded, Inc.

 */



#include "r8a7795-h3ulcb.dts"

#include "r8a77950-h3ulcb.dts"

#include "ulcb-kf.dtsi"



/ {

	model = "Renesas H3ULCB Kingfisher board based on r8a7795 ES2.0+";

	model = "Renesas H3ULCB Kingfisher board based on r8a77950";

	compatible = "shimafuji,kingfisher", "renesas,h3ulcb",

		     "renesas,r8a7795";

};

arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts→arch/arm64/boot/dts/renesas/r8a77950-h3ulcb.dts

+2 −2
Original line number Diff line number Diff line
@@ -7,11 +7,11 @@ 
 */



/dts-v1/;

#include "r8a7795-es1.dtsi"

#include "r8a77950.dtsi"

#include "ulcb.dtsi"



/ {

	model = "Renesas H3ULCB board based on r8a7795 ES1.x";

	model = "Renesas H3ULCB board based on r8a77950";

	compatible = "renesas,h3ulcb", "renesas,r8a7795";



	memory@48000000 {

arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts→arch/arm64/boot/dts/renesas/r8a77950-salvator-x.dts

+2 −2
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ 
 */



/dts-v1/;

#include "r8a7795-es1.dtsi"

#include "r8a77950.dtsi"

#include "salvator-x.dtsi"



/ {

	model = "Renesas Salvator-X board based on r8a7795 ES1.x";

	model = "Renesas Salvator-X board based on r8a77950";

	compatible = "renesas,salvator-x", "renesas,r8a7795";



	memory@48000000 {

arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi→arch/arm64/boot/dts/renesas/r8a77950.dtsi

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Device Tree Source for the R-Car H3 (R8A77950) ES1.x SoC

 * Device Tree Source for the R-Car H3 (R8A77950) SoC

 *

 * Copyright (C) 2015 Renesas Electronics Corp.

 */



#include "r8a7795.dtsi"

#include "r8a77951.dtsi"



&audma0 {

	iommus = <&ipmmu_mp1 0>, <&ipmmu_mp1 1>,