From: Marek Vasut <marek.vasut+renesas@mailbox.org>
Date: Tue, 27 Feb 2024 16:05:54 +0000 (+0100)
Subject: ARM: renesas: Rename rmobile.h to renesas.h
X-Git-Tag: v2024.10~336^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=65abdd1978341beea257c4b6c2584efeb2f3654d;p=platform%2Fkernel%2Fu-boot.git

ARM: renesas: Rename rmobile.h to renesas.h

Rename rmobile.h to renesas.h because all the chips are made
by Renesas, while only a subset of them is from the R-Mobile
line.

Use the following command to perform the rename:

"
$ git grep -l 'include.*rmobile.h' | \
  xargs -I {} sed -i '/include.*rmobile.h/ s@rmobile.h@renesas.h@g' {}
"

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
---

diff --git a/arch/arm/mach-rmobile/cpu_info-rzg2l.c b/arch/arm/mach-rmobile/cpu_info-rzg2l.c
index a1683a26e3..ab95ce7638 100644
--- a/arch/arm/mach-rmobile/cpu_info-rzg2l.c
+++ b/arch/arm/mach-rmobile/cpu_info-rzg2l.c
@@ -4,7 +4,7 @@
  *
  */
 
-#include <mach/rmobile.h>
+#include <mach/renesas.h>
 #include <asm/io.h>
 #include <linux/libfdt.h>
 
diff --git a/arch/arm/mach-rmobile/include/mach/renesas.h b/arch/arm/mach-rmobile/include/mach/renesas.h
new file mode 100644
index 0000000000..67c480048d
--- /dev/null
+++ b/arch/arm/mach-rmobile/include/mach/renesas.h
@@ -0,0 +1,56 @@
+#ifndef __ASM_ARCH_RMOBILE_H
+#define __ASM_ARCH_RMOBILE_H
+
+#if defined(CONFIG_ARCH_RMOBILE)
+#if defined(CONFIG_R8A7790)
+#include <asm/arch/r8a7790.h>
+#elif defined(CONFIG_R8A7791)
+#include <asm/arch/r8a7791.h>
+#elif defined(CONFIG_R8A7792)
+#include <asm/arch/r8a7792.h>
+#elif defined(CONFIG_R8A7793)
+#include <asm/arch/r8a7793.h>
+#elif defined(CONFIG_R8A7794)
+#include <asm/arch/r8a7794.h>
+#elif defined(CONFIG_RCAR_GEN3)
+#include <asm/arch/rcar-gen3-base.h>
+#elif defined(CONFIG_RCAR_GEN4)
+#include <asm/arch/rcar-gen4-base.h>
+#elif defined(CONFIG_R7S72100)
+#elif defined(CONFIG_RZG2L)
+#include <asm/arch/rzg2l.h>
+#else
+#error "SOC Name not defined"
+#endif
+#endif /* CONFIG_ARCH_RMOBILE */
+
+/* PRR CPU IDs */
+#define RENESAS_CPU_TYPE_R8A7740	0x40
+#define RENESAS_CPU_TYPE_R8A7790	0x45
+#define RENESAS_CPU_TYPE_R8A7791	0x47
+#define RENESAS_CPU_TYPE_R8A7792	0x4A
+#define RENESAS_CPU_TYPE_R8A7793	0x4B
+#define RENESAS_CPU_TYPE_R8A7794	0x4C
+#define RENESAS_CPU_TYPE_R8A7795	0x4F
+#define RENESAS_CPU_TYPE_R8A7796	0x52
+#define RENESAS_CPU_TYPE_R8A77965	0x55
+#define RENESAS_CPU_TYPE_R8A77970	0x54
+#define RENESAS_CPU_TYPE_R8A77980	0x56
+#define RENESAS_CPU_TYPE_R8A77990	0x57
+#define RENESAS_CPU_TYPE_R8A77995	0x58
+#define RENESAS_CPU_TYPE_R8A779A0	0x59
+#define RENESAS_CPU_TYPE_R8A779F0	0x5A
+#define RENESAS_CPU_TYPE_R8A779G0	0x5C
+#define RENESAS_CPU_TYPE_R8A779H0	0x5D
+#define RENESAS_CPU_TYPE_R9A07G044L	0x9A070440
+
+#ifndef __ASSEMBLY__
+#include <asm/types.h>
+
+const u8 *rzg_get_cpu_name(void);
+u32 renesas_get_cpu_type(void);
+u32 renesas_get_cpu_rev_integer(void);
+u32 renesas_get_cpu_rev_fraction(void);
+#endif /* __ASSEMBLY__ */
+
+#endif /* __ASM_ARCH_RMOBILE_H */
diff --git a/arch/arm/mach-rmobile/include/mach/rmobile.h b/arch/arm/mach-rmobile/include/mach/rmobile.h
deleted file mode 100644
index 67c480048d..0000000000
--- a/arch/arm/mach-rmobile/include/mach/rmobile.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef __ASM_ARCH_RMOBILE_H
-#define __ASM_ARCH_RMOBILE_H
-
-#if defined(CONFIG_ARCH_RMOBILE)
-#if defined(CONFIG_R8A7790)
-#include <asm/arch/r8a7790.h>
-#elif defined(CONFIG_R8A7791)
-#include <asm/arch/r8a7791.h>
-#elif defined(CONFIG_R8A7792)
-#include <asm/arch/r8a7792.h>
-#elif defined(CONFIG_R8A7793)
-#include <asm/arch/r8a7793.h>
-#elif defined(CONFIG_R8A7794)
-#include <asm/arch/r8a7794.h>
-#elif defined(CONFIG_RCAR_GEN3)
-#include <asm/arch/rcar-gen3-base.h>
-#elif defined(CONFIG_RCAR_GEN4)
-#include <asm/arch/rcar-gen4-base.h>
-#elif defined(CONFIG_R7S72100)
-#elif defined(CONFIG_RZG2L)
-#include <asm/arch/rzg2l.h>
-#else
-#error "SOC Name not defined"
-#endif
-#endif /* CONFIG_ARCH_RMOBILE */
-
-/* PRR CPU IDs */
-#define RENESAS_CPU_TYPE_R8A7740	0x40
-#define RENESAS_CPU_TYPE_R8A7790	0x45
-#define RENESAS_CPU_TYPE_R8A7791	0x47
-#define RENESAS_CPU_TYPE_R8A7792	0x4A
-#define RENESAS_CPU_TYPE_R8A7793	0x4B
-#define RENESAS_CPU_TYPE_R8A7794	0x4C
-#define RENESAS_CPU_TYPE_R8A7795	0x4F
-#define RENESAS_CPU_TYPE_R8A7796	0x52
-#define RENESAS_CPU_TYPE_R8A77965	0x55
-#define RENESAS_CPU_TYPE_R8A77970	0x54
-#define RENESAS_CPU_TYPE_R8A77980	0x56
-#define RENESAS_CPU_TYPE_R8A77990	0x57
-#define RENESAS_CPU_TYPE_R8A77995	0x58
-#define RENESAS_CPU_TYPE_R8A779A0	0x59
-#define RENESAS_CPU_TYPE_R8A779F0	0x5A
-#define RENESAS_CPU_TYPE_R8A779G0	0x5C
-#define RENESAS_CPU_TYPE_R8A779H0	0x5D
-#define RENESAS_CPU_TYPE_R9A07G044L	0x9A070440
-
-#ifndef __ASSEMBLY__
-#include <asm/types.h>
-
-const u8 *rzg_get_cpu_name(void);
-u32 renesas_get_cpu_type(void);
-u32 renesas_get_cpu_rev_integer(void);
-u32 renesas_get_cpu_rev_fraction(void);
-#endif /* __ASSEMBLY__ */
-
-#endif /* __ASM_ARCH_RMOBILE_H */
diff --git a/board/hoperun/hihope-rzg2/hihope-rzg2.c b/board/hoperun/hihope-rzg2/hihope-rzg2.c
index 3372290120..68d3d300dc 100644
--- a/board/hoperun/hihope-rzg2/hihope-rzg2.c
+++ b/board/hoperun/hihope-rzg2/hihope-rzg2.c
@@ -10,7 +10,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/processor.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <asm/arch/rcar-mstp.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c
index c61273489a..d428320239 100644
--- a/board/renesas/alt/alt.c
+++ b/board/renesas/alt/alt.c
@@ -22,7 +22,7 @@
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <asm/arch/rcar-mstp.h>
 #include <netdev.h>
 #include <miiphy.h>
diff --git a/board/renesas/alt/alt_spl.c b/board/renesas/alt/alt_spl.c
index fc9dac55e6..260863fd0e 100644
--- a/board/renesas/alt/alt_spl.c
+++ b/board/renesas/alt/alt_spl.c
@@ -16,7 +16,7 @@
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <asm/arch/rcar-mstp.h>
 
 #include <spl.h>
diff --git a/board/renesas/alt/qos.c b/board/renesas/alt/qos.c
index f0cdad4a80..b8edd5412a 100644
--- a/board/renesas/alt/qos.c
+++ b/board/renesas/alt/qos.c
@@ -9,7 +9,7 @@
 #include <asm/processor.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 
 #if defined(CONFIG_RENESAS_EXTRAM_BOOT)
 /* QoS version 0.311 for ES1 and version 0.321 for ES2 */
diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c
index 80faae6262..7f00d25a1c 100644
--- a/board/renesas/blanche/blanche.c
+++ b/board/renesas/blanche/blanche.c
@@ -10,7 +10,7 @@
 #include <init.h>
 #include <net.h>
 #include <asm/arch/rcar-mstp.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
diff --git a/board/renesas/blanche/qos.c b/board/renesas/blanche/qos.c
index d18877ee6d..f0bc7f7698 100644
--- a/board/renesas/blanche/qos.c
+++ b/board/renesas/blanche/qos.c
@@ -8,7 +8,7 @@
 #include <asm/processor.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 
 #if defined(CONFIG_RENESAS_EXTRAM_BOOT)
 enum {
diff --git a/board/renesas/draak/draak.c b/board/renesas/draak/draak.c
index 6242d2858d..a51bf65674 100644
--- a/board/renesas/draak/draak.c
+++ b/board/renesas/draak/draak.c
@@ -22,7 +22,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
 #include <asm/arch/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <asm/arch/rcar-mstp.h>
 #include <i2c.h>
 #include <mmc.h>
diff --git a/board/renesas/falcon/falcon.c b/board/renesas/falcon/falcon.c
index cd86bb3108..27fccacf6f 100644
--- a/board/renesas/falcon/falcon.c
+++ b/board/renesas/falcon/falcon.c
@@ -6,7 +6,7 @@
  * Copyright (C) 2020 Renesas Electronics Corp.
  */
 
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c
index 74e6bca789..b4b70d3a5b 100644
--- a/board/renesas/gose/gose.c
+++ b/board/renesas/gose/gose.c
@@ -23,7 +23,7 @@
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <asm/arch/rcar-mstp.h>
 #include <netdev.h>
 #include <miiphy.h>
diff --git a/board/renesas/gose/gose_spl.c b/board/renesas/gose/gose_spl.c
index 87126a0fc1..f6fc96f5cb 100644
--- a/board/renesas/gose/gose_spl.c
+++ b/board/renesas/gose/gose_spl.c
@@ -16,7 +16,7 @@
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <asm/arch/rcar-mstp.h>
 
 #include <spl.h>
diff --git a/board/renesas/gose/qos.c b/board/renesas/gose/qos.c
index fca3018523..29817e1841 100644
--- a/board/renesas/gose/qos.c
+++ b/board/renesas/gose/qos.c
@@ -9,7 +9,7 @@
 #include <asm/processor.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 
 #if defined(CONFIG_RENESAS_EXTRAM_BOOT)
 /* QoS version 0.311 */
diff --git a/board/renesas/grayhawk/grayhawk.c b/board/renesas/grayhawk/grayhawk.c
index 6f2e73f7d3..6c8fca8967 100644
--- a/board/renesas/grayhawk/grayhawk.c
+++ b/board/renesas/grayhawk/grayhawk.c
@@ -6,7 +6,7 @@
  * Copyright (C) 2023 Renesas Electronics Corp.
  */
 
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/renesas/koelsch/koelsch.c b/board/renesas/koelsch/koelsch.c
index 4d59b82a8a..78f3f90ae3 100644
--- a/board/renesas/koelsch/koelsch.c
+++ b/board/renesas/koelsch/koelsch.c
@@ -24,7 +24,7 @@
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <asm/arch/rcar-mstp.h>
 #include <netdev.h>
 #include <miiphy.h>
diff --git a/board/renesas/koelsch/koelsch_spl.c b/board/renesas/koelsch/koelsch_spl.c
index 7581920f57..2950b8df1d 100644
--- a/board/renesas/koelsch/koelsch_spl.c
+++ b/board/renesas/koelsch/koelsch_spl.c
@@ -16,7 +16,7 @@
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <asm/arch/rcar-mstp.h>
 
 #include <spl.h>
diff --git a/board/renesas/koelsch/qos.c b/board/renesas/koelsch/qos.c
index c947fff75c..ee89351006 100644
--- a/board/renesas/koelsch/qos.c
+++ b/board/renesas/koelsch/qos.c
@@ -9,7 +9,7 @@
 #include <asm/processor.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 
 /* QoS version 0.240 for ES1 and version 0.411 for ES2 */
 #if defined(CONFIG_RENESAS_EXTRAM_BOOT)
diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c
index ab06078c51..0ec8e3da4c 100644
--- a/board/renesas/lager/lager.c
+++ b/board/renesas/lager/lager.c
@@ -26,7 +26,7 @@
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <asm/arch/rcar-mstp.h>
 #include <miiphy.h>
 #include <i2c.h>
diff --git a/board/renesas/lager/lager_spl.c b/board/renesas/lager/lager_spl.c
index df3e240599..0799ba136d 100644
--- a/board/renesas/lager/lager_spl.c
+++ b/board/renesas/lager/lager_spl.c
@@ -16,7 +16,7 @@
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <asm/arch/rcar-mstp.h>
 
 #include <spl.h>
diff --git a/board/renesas/lager/qos.c b/board/renesas/lager/qos.c
index d12fdf0f11..80e57107a9 100644
--- a/board/renesas/lager/qos.c
+++ b/board/renesas/lager/qos.c
@@ -8,7 +8,7 @@
 #include <asm/processor.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 
 /* QoS version 0.955 for ES1 and version 0.973 for ES2 */
 #if defined(CONFIG_RENESAS_EXTRAM_BOOT)
diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c
index c0f91c7562..f38263cd94 100644
--- a/board/renesas/porter/porter.c
+++ b/board/renesas/porter/porter.c
@@ -24,7 +24,7 @@
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <asm/arch/rcar-mstp.h>
 #include <netdev.h>
 #include <miiphy.h>
diff --git a/board/renesas/porter/porter_spl.c b/board/renesas/porter/porter_spl.c
index 039fc7b719..1643446c76 100644
--- a/board/renesas/porter/porter_spl.c
+++ b/board/renesas/porter/porter_spl.c
@@ -16,7 +16,7 @@
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <asm/arch/rcar-mstp.h>
 
 #include <spl.h>
diff --git a/board/renesas/porter/qos.c b/board/renesas/porter/qos.c
index da6ae9ac55..87274eeb6d 100644
--- a/board/renesas/porter/qos.c
+++ b/board/renesas/porter/qos.c
@@ -10,7 +10,7 @@
 #include <asm/processor.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 
 /* QoS version 0.240 for ES1 and version 0.334 for ES2 */
 #if defined(CONFIG_RENESAS_EXTRAM_BOOT)
diff --git a/board/renesas/rcar-common/common.c b/board/renesas/rcar-common/common.c
index 66eb6a2002..499c31408f 100644
--- a/board/renesas/rcar-common/common.c
+++ b/board/renesas/rcar-common/common.c
@@ -14,7 +14,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/uclass-internal.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <linux/libfdt.h>
 
 #ifdef CONFIG_RCAR_64
diff --git a/board/renesas/rcar-common/v3-common.c b/board/renesas/rcar-common/v3-common.c
index 26c589d03e..5d057edb0a 100644
--- a/board/renesas/rcar-common/v3-common.c
+++ b/board/renesas/rcar-common/v3-common.c
@@ -4,7 +4,7 @@
  */
 
 #include <clock_legacy.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <asm/io.h>
 
 #define CPGWPR  0xE6150900
diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c
index ca05285a09..8c47246ae8 100644
--- a/board/renesas/salvator-x/salvator-x.c
+++ b/board/renesas/salvator-x/salvator-x.c
@@ -23,7 +23,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
 #include <asm/arch/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <asm/arch/rcar-mstp.h>
 #include <i2c.h>
 #include <mmc.h>
diff --git a/board/renesas/silk/qos.c b/board/renesas/silk/qos.c
index c1d4c612df..00e5e792e1 100644
--- a/board/renesas/silk/qos.c
+++ b/board/renesas/silk/qos.c
@@ -10,7 +10,7 @@
 #include <asm/processor.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 
 #if defined(CONFIG_RENESAS_EXTRAM_BOOT)
 /* QoS version 0.11 */
diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c
index 7dfbd412f6..cc64e44c0f 100644
--- a/board/renesas/silk/silk.c
+++ b/board/renesas/silk/silk.c
@@ -23,7 +23,7 @@
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <asm/arch/rcar-mstp.h>
 #include <netdev.h>
 #include <miiphy.h>
diff --git a/board/renesas/silk/silk_spl.c b/board/renesas/silk/silk_spl.c
index b899442c25..19b2e5ff87 100644
--- a/board/renesas/silk/silk_spl.c
+++ b/board/renesas/silk/silk_spl.c
@@ -16,7 +16,7 @@
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <asm/arch/rcar-mstp.h>
 
 #include <spl.h>
diff --git a/board/renesas/spider/spider.c b/board/renesas/spider/spider.c
index 1eb75a6397..414948f183 100644
--- a/board/renesas/spider/spider.c
+++ b/board/renesas/spider/spider.c
@@ -6,7 +6,7 @@
  * Copyright (C) 2021 Renesas Electronics Corp.
  */
 
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/renesas/stout/qos.c b/board/renesas/stout/qos.c
index 10f99f340b..a3e512c442 100644
--- a/board/renesas/stout/qos.c
+++ b/board/renesas/stout/qos.c
@@ -10,7 +10,7 @@
 #include <asm/processor.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 
 /* QoS version 0.955 for ES1 and version 0.973 for ES2 */
 #if defined(CONFIG_RENESAS_EXTRAM_BOOT)
diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c
index 109e19a292..f1d84b5a44 100644
--- a/board/renesas/stout/stout.c
+++ b/board/renesas/stout/stout.c
@@ -25,7 +25,7 @@
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <asm/arch/rcar-mstp.h>
 #include <miiphy.h>
 #include <i2c.h>
diff --git a/board/renesas/stout/stout_spl.c b/board/renesas/stout/stout_spl.c
index 8ec0216810..3c7cac809e 100644
--- a/board/renesas/stout/stout_spl.c
+++ b/board/renesas/stout/stout_spl.c
@@ -16,7 +16,7 @@
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <asm/arch/rcar-mstp.h>
 
 #include <spl.h>
diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
index 6addf2bc8b..8f5de21699 100644
--- a/board/renesas/ulcb/ulcb.c
+++ b/board/renesas/ulcb/ulcb.c
@@ -21,7 +21,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
 #include <asm/arch/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <asm/arch/rcar-mstp.h>
 #include <i2c.h>
 #include <mmc.h>
diff --git a/board/renesas/whitehawk/whitehawk.c b/board/renesas/whitehawk/whitehawk.c
index a72f5e0a7a..3a10b0220d 100644
--- a/board/renesas/whitehawk/whitehawk.c
+++ b/board/renesas/whitehawk/whitehawk.c
@@ -6,7 +6,7 @@
  * Copyright (C) 2021 Renesas Electronics Corp.
  */
 
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/spi/sh_qspi.c b/drivers/spi/sh_qspi.c
index 7dd1fe75e0..7259499385 100644
--- a/drivers/spi/sh_qspi.c
+++ b/drivers/spi/sh_qspi.c
@@ -13,7 +13,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <wait_bit.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index 291c2a43d4..67c9faeca5 100644
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -8,7 +8,7 @@
 #ifndef __RCAR_GEN2_COMMON_H
 #define __RCAR_GEN2_COMMON_H
 
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 
 /* console */
 #define CFG_SYS_BAUDRATE_TABLE	{ 38400, 115200 }
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index 213caa7523..5f4d5ced78 100644
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -9,7 +9,7 @@
 #ifndef __RCAR_GEN3_COMMON_H
 #define __RCAR_GEN3_COMMON_H
 
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 
 /* boot option */
 
diff --git a/include/configs/rcar-gen4-common.h b/include/configs/rcar-gen4-common.h
index c4f506df62..3465b4d182 100644
--- a/include/configs/rcar-gen4-common.h
+++ b/include/configs/rcar-gen4-common.h
@@ -9,7 +9,7 @@
 #ifndef __RCAR_GEN4_COMMON_H
 #define __RCAR_GEN4_COMMON_H
 
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 
 /* Console */
 #define CFG_SYS_BAUDRATE_TABLE	{ 38400, 115200, 921600, 1843200 }
diff --git a/include/configs/rzg2l-smarc.h b/include/configs/rzg2l-smarc.h
index ea57d280cb..580613068b 100644
--- a/include/configs/rzg2l-smarc.h
+++ b/include/configs/rzg2l-smarc.h
@@ -6,7 +6,7 @@
 #ifndef __RENESAS_RZG2L_H
 #define __RENESAS_RZG2L_H
 
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
 
 /* console */
 #define CFG_SYS_BAUDRATE_TABLE	{ 115200, 38400 }