Commit 83772e1b authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

arm64: dts: renesas: Rename r8a7796* to r8a77960* 



CONFIG_ARCH_R8A7796 was renamed to CONFIG_ARCH_R8A77960 in commit
39e57e14 ("soc: renesas: Add ARCH_R8A77960 for existing R-Car
M3-W"), to avoid confusion between R-Car M3-W (R8A77960) and R-Car M3-W+
(R8A77961).

Rename the DTS files as well, for consistency.

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

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20191211131311.23661-1-geert+renesas@glider.be


Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarEugeniu Rosca <erosca@de.adit-jv.com>
parent 87924226

arch/arm64/boot/dts/renesas/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -9,9 +9,9 @@ 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_R8A77960) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb

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

dtb-$(CONFIG_ARCH_R8A77960) += r8a7796-salvator-xs.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

dtb-$(CONFIG_ARCH_R8A77961) += r8a77961-salvator-xs.dtb

dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-salvator-x.dtb r8a77965-salvator-xs.dtb

dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-m3nulcb.dtb

arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts→arch/arm64/boot/dts/renesas/r8a77960-m3ulcb-kf.dts

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

 */



#include "r8a7796-m3ulcb.dts"

#include "r8a77960-m3ulcb.dts"

#include "ulcb-kf.dtsi"



/ {

	model = "Renesas M3ULCB Kingfisher board based on r8a7796";

	model = "Renesas M3ULCB Kingfisher board based on r8a77960";

	compatible = "shimafuji,kingfisher", "renesas,m3ulcb",

		     "renesas,r8a7796";

};

arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts→arch/arm64/boot/dts/renesas/r8a77960-m3ulcb.dts

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



/dts-v1/;

#include "r8a7796.dtsi"

#include "r8a77960.dtsi"

#include "ulcb.dtsi"



/ {

	model = "Renesas M3ULCB board based on r8a7796";

	model = "Renesas M3ULCB board based on r8a77960";

	compatible = "renesas,m3ulcb", "renesas,r8a7796";



	memory@48000000 {

arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts→arch/arm64/boot/dts/renesas/r8a77960-salvator-x.dts

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



/dts-v1/;

#include "r8a7796.dtsi"

#include "r8a77960.dtsi"

#include "salvator-x.dtsi"



/ {

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

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

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



	memory@48000000 {

arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts→arch/arm64/boot/dts/renesas/r8a77960-salvator-xs.dts

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



/dts-v1/;

#include "r8a7796.dtsi"

#include "r8a77960.dtsi"

#include "salvator-xs.dtsi"



/ {

	model = "Renesas Salvator-X 2nd version board based on r8a7796";

	model = "Renesas Salvator-X 2nd version board based on r8a77960";

	compatible = "renesas,salvator-xs", "renesas,r8a7796";



	memory@48000000 {