UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

CONFIG_ARCH_R8A7796 was renamed to CONFIG_ARCH_R8A77960 in commit
39e57e14d7 ("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: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20191211131311.23661-1-geert+renesas@glider.be
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Eugeniu Rosca <erosca@de.adit-jv.com>
This commit is contained in:
Geert Uytterhoeven 2019-12-11 14:13:11 +01:00
parent 8792422673
commit 83772e1b44
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm64/boot/dts/renesas/Makefile
View File

@ -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

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

@ -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";
};

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

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

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

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

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

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

0
arch/arm64/boot/dts/renesas/r8a7796.dtsi → arch/arm64/boot/dts/renesas/r8a77960.dtsi
View File