Merge patch series "ARM: renesas: Rename R-Mobile to Renesas"

Marek Vasut <[email protected]> says:

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

49 files changed, 86 insertions, 102 deletions

diff --git a/board/beacon/beacon-rzg2m/Kconfig b/board/beacon/beacon-rzg2m/Kconfig
index c03857cf2fe..1eb9e0dda94 100644
--- a/board/beacon/beacon-rzg2m/Kconfig
+++ b/board/beacon/beacon-rzg2m/Kconfig
@@ -1,7 +1,7 @@
 if TARGET_BEACON_RZG2M
 
 config SYS_SOC
-	default "rmobile"
+	default "renesas"
 
 config SYS_BOARD
 	default "beacon-rzg2m"
diff --git a/board/hoperun/hihope-rzg2/Kconfig b/board/hoperun/hihope-rzg2/Kconfig
index ee422ba6c8f..e15b54ae5ce 100644
--- a/board/hoperun/hihope-rzg2/Kconfig
+++ b/board/hoperun/hihope-rzg2/Kconfig
@@ -1,7 +1,7 @@
 if TARGET_HIHOPE_RZG2
 
 config SYS_SOC
-	default "rmobile"
+	default "renesas"
 
 config SYS_BOARD
 	default "hihope-rzg2"
diff --git a/board/hoperun/hihope-rzg2/hihope-rzg2.c b/board/hoperun/hihope-rzg2/hihope-rzg2.c
index 3372290120b..68d3d300dc4 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 be77cade01b..d4283202394 100644
--- a/board/renesas/alt/alt.c
+++ b/board/renesas/alt/alt.c
@@ -22,10 +22,8 @@
 #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 <asm/arch/mmc.h>
-#include <asm/arch/sh_sdhi.h>
 #include <netdev.h>
 #include <miiphy.h>
 #include <i2c.h>
diff --git a/board/renesas/alt/alt_spl.c b/board/renesas/alt/alt_spl.c
index fc9dac55e6a..260863fd0e2 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 38dfa647e81..b8edd5412aa 100644
--- a/board/renesas/alt/qos.c
+++ b/board/renesas/alt/qos.c
@@ -9,9 +9,9 @@
 #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_ARCH_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_RENESAS_EXTRAM_BOOT)
 /* QoS version 0.311 for ES1 and version 0.321 for ES2 */
 
 enum {
@@ -991,8 +991,8 @@ void qos_init(void)
 	writel(0x00000001, &axi_qos->qosthres2);
 	writel(0x00000001, &axi_qos->qosqon);
 }
-#else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
+#else /* CONFIG_RENESAS_EXTRAM_BOOT */
 void qos_init(void)
 {
 }
-#endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
+#endif /* CONFIG_RENESAS_EXTRAM_BOOT */
diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c
index c6ecea2afcf..7f00d25a1ca 100644
--- a/board/renesas/blanche/blanche.c
+++ b/board/renesas/blanche/blanche.c
@@ -9,10 +9,8 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
-#include <asm/arch/mmc.h>
 #include <asm/arch/rcar-mstp.h>
-#include <asm/arch/rmobile.h>
-#include <asm/arch/sh_sdhi.h>
+#include <asm/arch/renesas.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
@@ -51,7 +49,7 @@ static void blanche_init_sys(void)
 	struct rcar_swdt *swdt = (struct rcar_swdt *)SWDT_BASE;
 	u32 cpu_type;
 
-	cpu_type = rmobile_get_cpu_type();
+	cpu_type = renesas_get_cpu_type();
 	if (cpu_type == 0x4A) {
 		writel(0x4D000000, CPG_PLL1CR);
 		writel(0x4F000000, CPG_PLL3CR);
diff --git a/board/renesas/blanche/qos.c b/board/renesas/blanche/qos.c
index 3134b36a443..f0bc7f7698b 100644
--- a/board/renesas/blanche/qos.c
+++ b/board/renesas/blanche/qos.c
@@ -8,9 +8,9 @@
 #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_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_RENESAS_EXTRAM_BOOT)
 enum {
 	DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04,
 	DBSC3_05, DBSC3_06, DBSC3_07, DBSC3_08, DBSC3_09,
@@ -1357,8 +1357,8 @@ void qos_init(void)
 	writel(0x0000F700, CCI_AXI_AX2ADDRMASK);
 
 }
-#else /* CONFIG_RMOBILE_EXTRAM_BOOT */
+#else /* CONFIG_RENESAS_EXTRAM_BOOT */
 void qos_init(void)
 {
 }
-#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */
+#endif /* CONFIG_RENESAS_EXTRAM_BOOT */
diff --git a/board/renesas/condor/Kconfig b/board/renesas/condor/Kconfig
index 2286d88de7f..fbfb12cc4f9 100644
--- a/board/renesas/condor/Kconfig
+++ b/board/renesas/condor/Kconfig
@@ -1,7 +1,7 @@
 if TARGET_CONDOR
 
 config SYS_SOC
-	default "rmobile"
+	default "renesas"
 
 config SYS_BOARD
 	default "condor"
diff --git a/board/renesas/draak/Kconfig b/board/renesas/draak/Kconfig
index 9106387bb99..8f3d904f9d7 100644
--- a/board/renesas/draak/Kconfig
+++ b/board/renesas/draak/Kconfig
@@ -1,7 +1,7 @@
 if TARGET_DRAAK
 
 config SYS_SOC
-	default "rmobile"
+	default "renesas"
 
 config SYS_BOARD
 	default "draak"
diff --git a/board/renesas/draak/draak.c b/board/renesas/draak/draak.c
index 06a3a832984..a51bf65674f 100644
--- a/board/renesas/draak/draak.c
+++ b/board/renesas/draak/draak.c
@@ -22,9 +22,8 @@
 #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 <asm/arch/sh_sdhi.h>
 #include <i2c.h>
 #include <mmc.h>
 
diff --git a/board/renesas/eagle/Kconfig b/board/renesas/eagle/Kconfig
index 4d12843b4e9..04895d2bb4b 100644
--- a/board/renesas/eagle/Kconfig
+++ b/board/renesas/eagle/Kconfig
@@ -1,7 +1,7 @@
 if TARGET_EAGLE
 
 config SYS_SOC
-	default "rmobile"
+	default "renesas"
 
 config SYS_BOARD
 	default "eagle"
diff --git a/board/renesas/ebisu/Kconfig b/board/renesas/ebisu/Kconfig
index f500a94c9a3..a9049b6d5ad 100644
--- a/board/renesas/ebisu/Kconfig
+++ b/board/renesas/ebisu/Kconfig
@@ -1,7 +1,7 @@
 if TARGET_EBISU
 
 config SYS_SOC
-	default "rmobile"
+	default "renesas"
 
 config SYS_BOARD
 	default "ebisu"
diff --git a/board/renesas/falcon/Kconfig b/board/renesas/falcon/Kconfig
index 1fcefa7e3cd..44a2e5651ae 100644
--- a/board/renesas/falcon/Kconfig
+++ b/board/renesas/falcon/Kconfig
@@ -1,7 +1,7 @@
 if TARGET_FALCON
 
 config SYS_SOC
-	default "rmobile"
+	default "renesas"
 
 config SYS_BOARD
 	default "falcon"
diff --git a/board/renesas/falcon/falcon.c b/board/renesas/falcon/falcon.c
index cd86bb3108c..27fccacf6f8 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 6edbdac3ded..b4b70d3a5b2 100644
--- a/board/renesas/gose/gose.c
+++ b/board/renesas/gose/gose.c
@@ -23,9 +23,8 @@
 #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 <asm/arch/sh_sdhi.h>
 #include <netdev.h>
 #include <miiphy.h>
 #include <i2c.h>
diff --git a/board/renesas/gose/gose_spl.c b/board/renesas/gose/gose_spl.c
index 87126a0fc15..f6fc96f5cbd 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 9944df76759..29817e1841e 100644
--- a/board/renesas/gose/qos.c
+++ b/board/renesas/gose/qos.c
@@ -9,9 +9,9 @@
 #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_ARCH_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_RENESAS_EXTRAM_BOOT)
 /* QoS version 0.311 */
 enum {
 	DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04,
@@ -1194,8 +1194,8 @@ void qos_init(void)
 	writel(0x00000001, &axi_qos->qosthres2);
 	writel(0x00000001, &axi_qos->qosqon);
 }
-#else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
+#else /* CONFIG_RENESAS_EXTRAM_BOOT */
 void qos_init(void)
 {
 }
-#endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
+#endif /* CONFIG_RENESAS_EXTRAM_BOOT */
diff --git a/board/renesas/grayhawk/Kconfig b/board/renesas/grayhawk/Kconfig
index 97621a30ad0..a6dbfb50e73 100644
--- a/board/renesas/grayhawk/Kconfig
+++ b/board/renesas/grayhawk/Kconfig
@@ -1,7 +1,7 @@
 if TARGET_GRAYHAWK
 
 config SYS_SOC
-	default "rmobile"
+	default "renesas"
 
 config SYS_BOARD
 	default "grayhawk"
diff --git a/board/renesas/grayhawk/grayhawk.c b/board/renesas/grayhawk/grayhawk.c
index 6f2e73f7d38..6c8fca89679 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 ee5597ad3d9..78f3f90ae3b 100644
--- a/board/renesas/koelsch/koelsch.c
+++ b/board/renesas/koelsch/koelsch.c
@@ -24,9 +24,8 @@
 #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 <asm/arch/sh_sdhi.h>
 #include <netdev.h>
 #include <miiphy.h>
 #include <i2c.h>
diff --git a/board/renesas/koelsch/koelsch_spl.c b/board/renesas/koelsch/koelsch_spl.c
index 7581920f577..2950b8df1dc 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 70cd117ba6b..ee893510060 100644
--- a/board/renesas/koelsch/qos.c
+++ b/board/renesas/koelsch/qos.c
@@ -9,10 +9,10 @@
 #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_ARCH_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_RENESAS_EXTRAM_BOOT)
 enum {
 	DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04,
 	DBSC3_05, DBSC3_06, DBSC3_07, DBSC3_08, DBSC3_09,
@@ -1382,8 +1382,8 @@ void qos_init(void)
 	writel(0x00000001, &axi_qos->qosthres2);
 	writel(0x00000001, &axi_qos->qosqon);
 }
-#else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
+#else /* CONFIG_RENESAS_EXTRAM_BOOT */
 void qos_init(void)
 {
 }
-#endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
+#endif /* CONFIG_RENESAS_EXTRAM_BOOT */
diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c
index 0daad0b1e6d..0ec8e3da4c2 100644
--- a/board/renesas/lager/lager.c
+++ b/board/renesas/lager/lager.c
@@ -26,10 +26,8 @@
 #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 <asm/arch/mmc.h>
-#include <asm/arch/sh_sdhi.h>
 #include <miiphy.h>
 #include <i2c.h>
 #include <mmc.h>
@@ -48,7 +46,7 @@ void s_init(void)
 	writel(0xA5A5A500, &swdt->swtcsra);
 
 	/* CPU frequency setting. Set to 1.4GHz */
-	if (rmobile_get_cpu_rev_integer() >= R8A7790_CUT_ES2X) {
+	if (renesas_get_cpu_rev_integer() >= R8A7790_CUT_ES2X) {
 		u32 stat = 0;
 		u32 stc = ((1400 / CLK2MHZ(get_board_sys_clk())) - 1)
 			<< PLL0_STC_BIT;
diff --git a/board/renesas/lager/lager_spl.c b/board/renesas/lager/lager_spl.c
index df3e240599a..0799ba136d5 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 ddc831c0c21..80e57107a94 100644
--- a/board/renesas/lager/qos.c
+++ b/board/renesas/lager/qos.c
@@ -8,10 +8,10 @@
 #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_ARCH_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_RENESAS_EXTRAM_BOOT)
 enum {
 	DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04,
 	DBSC3_05, DBSC3_06, DBSC3_07, DBSC3_08, DBSC3_09,
@@ -2419,13 +2419,13 @@ static void qos_init_es2(void)
 
 void qos_init(void)
 {
-	if (rmobile_get_cpu_rev_integer() >= R8A7790_CUT_ES2X)
+	if (renesas_get_cpu_rev_integer() >= R8A7790_CUT_ES2X)
 		qos_init_es2();
 	else
 		qos_init_es1();
 }
-#else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
+#else /* CONFIG_RENESAS_EXTRAM_BOOT */
 void qos_init(void)
 {
 }
-#endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
+#endif /* CONFIG_RENESAS_EXTRAM_BOOT */
diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c
index 2e6051addb1..f38263cd944 100644
--- a/board/renesas/porter/porter.c
+++ b/board/renesas/porter/porter.c
@@ -24,9 +24,8 @@
 #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 <asm/arch/sh_sdhi.h>
 #include <netdev.h>
 #include <miiphy.h>
 #include <i2c.h>
diff --git a/board/renesas/porter/porter_spl.c b/board/renesas/porter/porter_spl.c
index 039fc7b719e..1643446c763 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 e4d8f3dfafe..87274eeb6d9 100644
--- a/board/renesas/porter/qos.c
+++ b/board/renesas/porter/qos.c
@@ -10,10 +10,10 @@
 #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_ARCH_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_RENESAS_EXTRAM_BOOT)
 enum {
 	DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04,
 	DBSC3_05, DBSC3_06, DBSC3_07, DBSC3_08, DBSC3_09,
@@ -1303,8 +1303,8 @@ void qos_init(void)
 	writel(0x00000001, &axi_qos->qosthres2);
 	writel(0x00000001, &axi_qos->qosqon);
 }
-#else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
+#else /* CONFIG_RENESAS_EXTRAM_BOOT */
 void qos_init(void)
 {
 }
-#endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
+#endif /* CONFIG_RENESAS_EXTRAM_BOOT */
diff --git a/board/renesas/rcar-common/common.c b/board/renesas/rcar-common/common.c
index 66eb6a2002c..499c31408f6 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 26c589d03e9..5d057edb0a6 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/rzg2l/Kconfig b/board/renesas/rzg2l/Kconfig
index 1335fc7ae80..c7b75704beb 100644
--- a/board/renesas/rzg2l/Kconfig
+++ b/board/renesas/rzg2l/Kconfig
@@ -4,7 +4,7 @@
 if TARGET_RZG2L_SMARC_EVK
 
 config SYS_SOC
-	default "rmobile"
+	default "renesas"
 
 config SYS_BOARD
 	default "rzg2l"
diff --git a/board/renesas/salvator-x/Kconfig b/board/renesas/salvator-x/Kconfig
index ed4c479f7ca..52955e144a6 100644
--- a/board/renesas/salvator-x/Kconfig
+++ b/board/renesas/salvator-x/Kconfig
@@ -1,7 +1,7 @@
 if TARGET_SALVATOR_X
 
 config SYS_SOC
-	default "rmobile"
+	default "renesas"
 
 config SYS_BOARD
 	default "salvator-x"
diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c
index d8312ddb8a9..8c47246ae8b 100644
--- a/board/renesas/salvator-x/salvator-x.c
+++ b/board/renesas/salvator-x/salvator-x.c
@@ -23,9 +23,8 @@
 #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 <asm/arch/sh_sdhi.h>
 #include <i2c.h>
 #include <mmc.h>
 
@@ -77,17 +76,17 @@ void reset_cpu(void)
 int board_fit_config_name_match(const char *name)
 {
 	/* PRR driver is not available yet */
-	u32 cpu_type = rmobile_get_cpu_type();
+	u32 cpu_type = renesas_get_cpu_type();
 
-	if ((cpu_type == RMOBILE_CPU_TYPE_R8A7795) &&
+	if ((cpu_type == RENESAS_CPU_TYPE_R8A7795) &&
 	    !strcmp(name, "r8a77950-salvator-x-u-boot"))
 		return 0;
 
-	if ((cpu_type == RMOBILE_CPU_TYPE_R8A7796) &&
+	if ((cpu_type == RENESAS_CPU_TYPE_R8A7796) &&
 	    !strcmp(name, "r8a77960-salvator-x-u-boot"))
 		return 0;
 
-	if ((cpu_type == RMOBILE_CPU_TYPE_R8A77965) &&
+	if ((cpu_type == RENESAS_CPU_TYPE_R8A77965) &&
 	    !strcmp(name, "r8a77965-salvator-x-u-boot"))
 		return 0;
 
diff --git a/board/renesas/silk/qos.c b/board/renesas/silk/qos.c
index bdd76461b6a..00e5e792e19 100644
--- a/board/renesas/silk/qos.c
+++ b/board/renesas/silk/qos.c
@@ -10,9 +10,9 @@
 #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_ARCH_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_RENESAS_EXTRAM_BOOT)
 /* QoS version 0.11 */
 
 enum {
@@ -942,8 +942,8 @@ void qos_init(void)
 	writel(0x00000001, &axi_qos->qosthres2);
 	writel(0x00000001, &axi_qos->qosqon);
 }
-#else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
+#else /* CONFIG_RENESAS_EXTRAM_BOOT */
 void qos_init(void)
 {
 }
-#endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
+#endif /* CONFIG_RENESAS_EXTRAM_BOOT */
diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c
index 18ff7591228..cc64e44c0f7 100644
--- a/board/renesas/silk/silk.c
+++ b/board/renesas/silk/silk.c
@@ -23,10 +23,8 @@
 #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 <asm/arch/mmc.h>
-#include <asm/arch/sh_sdhi.h>
 #include <netdev.h>
 #include <miiphy.h>
 #include <i2c.h>
diff --git a/board/renesas/silk/silk_spl.c b/board/renesas/silk/silk_spl.c
index b899442c25a..19b2e5ff87c 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/Kconfig b/board/renesas/spider/Kconfig
index 8df2e85fc9c..bd5825ef56c 100644
--- a/board/renesas/spider/Kconfig
+++ b/board/renesas/spider/Kconfig
@@ -1,7 +1,7 @@
 if TARGET_SPIDER
 
 config SYS_SOC
-	default "rmobile"
+	default "renesas"
 
 config SYS_BOARD
 	default "spider"
diff --git a/board/renesas/spider/spider.c b/board/renesas/spider/spider.c
index 1eb75a6397f..414948f1831 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 9030ba7f61f..a3e512c4423 100644
--- a/board/renesas/stout/qos.c
+++ b/board/renesas/stout/qos.c
@@ -10,10 +10,10 @@
 #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_ARCH_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_RENESAS_EXTRAM_BOOT)
 enum {
 	DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04,
 	DBSC3_05, DBSC3_06, DBSC3_07, DBSC3_08, DBSC3_09,
@@ -2421,13 +2421,13 @@ static void qos_init_es2(void)
 
 void qos_init(void)
 {
-	if (rmobile_get_cpu_rev_integer() >= R8A7790_CUT_ES2X)
+	if (renesas_get_cpu_rev_integer() >= R8A7790_CUT_ES2X)
 		qos_init_es2();
 	else
 		qos_init_es1();
 }
-#else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
+#else /* CONFIG_RENESAS_EXTRAM_BOOT */
 void qos_init(void)
 {
 }
-#endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */
+#endif /* CONFIG_RENESAS_EXTRAM_BOOT */
diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c
index 131deac1c7a..f1d84b5a446 100644
--- a/board/renesas/stout/stout.c
+++ b/board/renesas/stout/stout.c
@@ -25,10 +25,8 @@
 #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 <asm/arch/mmc.h>
-#include <asm/arch/sh_sdhi.h>
 #include <miiphy.h>
 #include <i2c.h>
 #include <mmc.h>
@@ -48,7 +46,7 @@ void s_init(void)
 	writel(0xA5A5A500, &swdt->swtcsra);
 
 	/* CPU frequency setting. Set to 1.4GHz */
-	if (rmobile_get_cpu_rev_integer() >= R8A7790_CUT_ES2X) {
+	if (renesas_get_cpu_rev_integer() >= R8A7790_CUT_ES2X) {
 		u32 stat = 0;
 		u32 stc = ((1400 / CLK2MHZ(get_board_sys_clk())) - 1)
 			<< PLL0_STC_BIT;
diff --git a/board/renesas/stout/stout_spl.c b/board/renesas/stout/stout_spl.c
index 8ec02168106..3c7cac809eb 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/Kconfig b/board/renesas/ulcb/Kconfig
index 1e9a10d2814..318603608ce 100644
--- a/board/renesas/ulcb/Kconfig
+++ b/board/renesas/ulcb/Kconfig
@@ -1,7 +1,7 @@
 if TARGET_ULCB
 
 config SYS_SOC
-	default "rmobile"
+	default "renesas"
 
 config SYS_BOARD
 	default "ulcb"
diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
index b2a16b03513..8f5de216995 100644
--- a/board/renesas/ulcb/ulcb.c
+++ b/board/renesas/ulcb/ulcb.c
@@ -21,9 +21,8 @@
 #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 <asm/arch/sh_sdhi.h>
 #include <i2c.h>
 #include <mmc.h>
 
@@ -68,17 +67,17 @@ int board_init(void)
 int board_fit_config_name_match(const char *name)
 {
 	/* PRR driver is not available yet */
-	u32 cpu_type = rmobile_get_cpu_type();
+	u32 cpu_type = renesas_get_cpu_type();
 
-	if ((cpu_type == RMOBILE_CPU_TYPE_R8A7795) &&
+	if ((cpu_type == RENESAS_CPU_TYPE_R8A7795) &&
 	    !strcmp(name, "r8a77950-ulcb-u-boot"))
 		return 0;
 
-	if ((cpu_type == RMOBILE_CPU_TYPE_R8A7796) &&
+	if ((cpu_type == RENESAS_CPU_TYPE_R8A7796) &&
 	    !strcmp(name, "r8a77960-ulcb-u-boot"))
 		return 0;
 
-	if ((cpu_type == RMOBILE_CPU_TYPE_R8A77965) &&
+	if ((cpu_type == RENESAS_CPU_TYPE_R8A77965) &&
 	    !strcmp(name, "r8a77965-ulcb-u-boot"))
 		return 0;
 
diff --git a/board/renesas/v3hsk/Kconfig b/board/renesas/v3hsk/Kconfig
index 531ceb788f4..da595a493b5 100644
--- a/board/renesas/v3hsk/Kconfig
+++ b/board/renesas/v3hsk/Kconfig
@@ -1,7 +1,7 @@
 if TARGET_V3HSK
 
 config SYS_SOC
-	default "rmobile"
+	default "renesas"
 
 config SYS_BOARD
 	default "v3hsk"
diff --git a/board/renesas/v3msk/Kconfig b/board/renesas/v3msk/Kconfig
index fe037fd98f0..8f423868962 100644
--- a/board/renesas/v3msk/Kconfig
+++ b/board/renesas/v3msk/Kconfig
@@ -1,7 +1,7 @@
 if TARGET_V3MSK
 
 config SYS_SOC
-	default "rmobile"
+	default "renesas"
 
 config SYS_BOARD
 	default "v3msk"
diff --git a/board/renesas/whitehawk/Kconfig b/board/renesas/whitehawk/Kconfig
index 05a87894fac..8adb24c2d2e 100644
--- a/board/renesas/whitehawk/Kconfig
+++ b/board/renesas/whitehawk/Kconfig
@@ -1,7 +1,7 @@
 if TARGET_WHITEHAWK
 
 config SYS_SOC
-	default "rmobile"
+	default "renesas"
 
 config SYS_BOARD
 	default "whitehawk"
diff --git a/board/renesas/whitehawk/whitehawk.c b/board/renesas/whitehawk/whitehawk.c
index a72f5e0a7a5..3a10b0220d1 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/board/silinux/ek874/Kconfig b/board/silinux/ek874/Kconfig
index 60b390a121e..5b34087bff8 100644
--- a/board/silinux/ek874/Kconfig
+++ b/board/silinux/ek874/Kconfig
@@ -1,7 +1,7 @@
 if TARGET_SILINUX_EK874
 
 config SYS_SOC
-	default "rmobile"
+	default "renesas"
 
 config SYS_BOARD
 	default "ek874"