diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile index 7f75178bc1ec..ea6400b6492f 100644 --- a/arch/arm64/boot/dts/renesas/Makefile +++ b/arch/arm64/boot/dts/renesas/Makefile @@ -5,18 +5,18 @@ 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) += r8a77951-salvator-x.dtb r8a77951-h3ulcb.dtb -dtb-$(CONFIG_ARCH_R8A7795) += r8a77951-h3ulcb-kf.dtb +dtb-$(CONFIG_ARCH_R8A7795) += r8a77951-salvator-x.dtb r8a77951-ulcb.dtb +dtb-$(CONFIG_ARCH_R8A7795) += r8a77951-ulcb-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_R8A7795) += r8a77950-salvator-x.dtb r8a77950-ulcb.dtb +dtb-$(CONFIG_ARCH_R8A7795) += r8a77950-ulcb-kf.dtb +dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-salvator-x.dtb r8a77960-ulcb.dtb +dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-ulcb-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 -dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-m3nulcb-kf.dtb +dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-ulcb.dtb +dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-ulcb-kf.dtb dtb-$(CONFIG_ARCH_R8A77970) += r8a77970-eagle.dtb r8a77970-v3msk.dtb dtb-$(CONFIG_ARCH_R8A77980) += r8a77980-condor.dtb r8a77980-v3hsk.dtb dtb-$(CONFIG_ARCH_R8A77990) += r8a77990-ebisu.dtb diff --git a/arch/arm64/boot/dts/renesas/r8a77950-h3ulcb-kf.dts b/arch/arm64/boot/dts/renesas/r8a77950-ulcb-kf.dts similarity index 92% rename from arch/arm64/boot/dts/renesas/r8a77950-h3ulcb-kf.dts rename to arch/arm64/boot/dts/renesas/r8a77950-ulcb-kf.dts index 1e84a40f1dca..dcaaf12cec40 100644 --- a/arch/arm64/boot/dts/renesas/r8a77950-h3ulcb-kf.dts +++ b/arch/arm64/boot/dts/renesas/r8a77950-ulcb-kf.dts @@ -6,7 +6,7 @@ * Copyright (C) 2017 Cogent Embedded, Inc. */ -#include "r8a77950-h3ulcb.dts" +#include "r8a77950-ulcb.dts" #include "ulcb-kf.dtsi" / { diff --git a/arch/arm64/boot/dts/renesas/r8a77950-h3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a77950-ulcb.dts similarity index 100% rename from arch/arm64/boot/dts/renesas/r8a77950-h3ulcb.dts rename to arch/arm64/boot/dts/renesas/r8a77950-ulcb.dts diff --git a/arch/arm64/boot/dts/renesas/r8a77951-h3ulcb-kf.dts b/arch/arm64/boot/dts/renesas/r8a77951-ulcb-kf.dts similarity index 92% rename from arch/arm64/boot/dts/renesas/r8a77951-h3ulcb-kf.dts rename to arch/arm64/boot/dts/renesas/r8a77951-ulcb-kf.dts index 647198bb3bf7..11f943a67703 100644 --- a/arch/arm64/boot/dts/renesas/r8a77951-h3ulcb-kf.dts +++ b/arch/arm64/boot/dts/renesas/r8a77951-ulcb-kf.dts @@ -6,7 +6,7 @@ * Copyright (C) 2017 Cogent Embedded, Inc. */ -#include "r8a77951-h3ulcb.dts" +#include "r8a77951-ulcb.dts" #include "ulcb-kf.dtsi" / { diff --git a/arch/arm64/boot/dts/renesas/r8a77951-h3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a77951-ulcb.dts similarity index 100% rename from arch/arm64/boot/dts/renesas/r8a77951-h3ulcb.dts rename to arch/arm64/boot/dts/renesas/r8a77951-ulcb.dts diff --git a/arch/arm64/boot/dts/renesas/r8a77960-m3ulcb-kf.dts b/arch/arm64/boot/dts/renesas/r8a77960-ulcb-kf.dts similarity index 92% rename from arch/arm64/boot/dts/renesas/r8a77960-m3ulcb-kf.dts rename to arch/arm64/boot/dts/renesas/r8a77960-ulcb-kf.dts index 611dd2d4fae9..2151c37d77a6 100644 --- a/arch/arm64/boot/dts/renesas/r8a77960-m3ulcb-kf.dts +++ b/arch/arm64/boot/dts/renesas/r8a77960-ulcb-kf.dts @@ -6,7 +6,7 @@ * Copyright (C) 2017 Cogent Embedded, Inc. */ -#include "r8a77960-m3ulcb.dts" +#include "r8a77960-ulcb.dts" #include "ulcb-kf.dtsi" / { diff --git a/arch/arm64/boot/dts/renesas/r8a77960-m3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a77960-ulcb.dts similarity index 100% rename from arch/arm64/boot/dts/renesas/r8a77960-m3ulcb.dts rename to arch/arm64/boot/dts/renesas/r8a77960-ulcb.dts diff --git a/arch/arm64/boot/dts/renesas/r8a77965-m3nulcb-kf.dts b/arch/arm64/boot/dts/renesas/r8a77965-ulcb-kf.dts similarity index 92% rename from arch/arm64/boot/dts/renesas/r8a77965-m3nulcb-kf.dts rename to arch/arm64/boot/dts/renesas/r8a77965-ulcb-kf.dts index dadad97051b9..12aa08fd6fd8 100644 --- a/arch/arm64/boot/dts/renesas/r8a77965-m3nulcb-kf.dts +++ b/arch/arm64/boot/dts/renesas/r8a77965-ulcb-kf.dts @@ -6,7 +6,7 @@ * Copyright (C) 2018 Cogent Embedded, Inc. */ -#include "r8a77965-m3nulcb.dts" +#include "r8a77965-ulcb.dts" #include "ulcb-kf.dtsi" / { diff --git a/arch/arm64/boot/dts/renesas/r8a77965-m3nulcb.dts b/arch/arm64/boot/dts/renesas/r8a77965-ulcb.dts similarity index 100% rename from arch/arm64/boot/dts/renesas/r8a77965-m3nulcb.dts rename to arch/arm64/boot/dts/renesas/r8a77965-ulcb.dts