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 a1683a26e356490bab7694c8d6c5b51a805095db..ab95ce76388ed16f251d9297562fc2f8fed3dc72 100644 (file)
--- 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 (file)
index 0000000..67c4800
--- /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 (file)
index 67c4800..0000000
--- 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 3372290120b58516dc0007672f94947459949932..68d3d300dc40627156b5a0dae6499c0a6d094efe 100644 (file)
--- 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 c61273489a02f20434418fe0e50abbeca6a0791e..d428320239425fcf3d1367d7bb23a4c714cdba52 100644 (file)
--- 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 fc9dac55e6a32bc65720366c8f0c4ec15b433fd8..260863fd0e21642fb5e224f9111e90f8af90a1b3 100644 (file)
--- 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 f0cdad4a80fb0c891b884a1625084198ed89babd..b8edd5412aa3d6512c31f2ce960a5eeeb92e51db 100644 (file)
--- 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 80faae62624070ef8390550822b28908326e2611..7f00d25a1ca291a9684f18f810d49754b1578f9c 100644 (file)
--- 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 d18877ee6dbd623f9e67b24d24a3a80555b29a64..f0bc7f7698bcec8d6c1a795ac6cef953597f78c2 100644 (file)
--- 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 6242d2858dcf49832aeb13bd9d7c07a6ce2b595c..a51bf65674fd468de8ea1e27087f22481f129015 100644 (file)
--- 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 cd86bb3108c994225611a8e5a5f6f36017d2c81f..27fccacf6f809b5e8a062993f19de89cd35d9745 100644 (file)
--- 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 74e6bca789355b7795627057f088d888424779dc..b4b70d3a5b20a8185f4486a343764e7889c8862e 100644 (file)
--- 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 87126a0fc152dde53b026d43125f85a90ed6467e..f6fc96f5cbd058415e215605428f9d017ea259c0 100644 (file)
--- 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 fca30185231efb66e8a14abbe80a4f9942d57f10..29817e1841e6dc93a7655365d08982f8de542809 100644 (file)
--- 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 6f2e73f7d38451c6f33397f868c61aa21f5b8708..6c8fca89679d6f09026cd143e1e7324f6e9a90bf 100644 (file)
--- 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 4d59b82a8ad8e666f48db57ae9e3631c33a92f62..78f3f90ae3bd585233a2ce81440884ca5c43ecfb 100644 (file)
--- 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 7581920f577182b71472e102132e65fd52959374..2950b8df1dcecdcb4a9a085f220b7083c3e6b8b1 100644 (file)
--- 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 c947fff75c7efc61cc785096ee856adf1fc2db33..ee893510060af3732a6377dfa40a1496ed14b71b 100644 (file)
--- 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 ab06078c5114506c722864f5044c59eb26a2564b..0ec8e3da4c2f50eb88c1518c794d13b6a1cd2d1d 100644 (file)
--- 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 df3e240599a2771129c1210f1e59e8743ea47937..0799ba136d5935ef2f352303ca78dde671695139 100644 (file)
--- 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 d12fdf0f11fe722740dc530f26bc153fae26939d..80e57107a941face635239d23ce0ed5c36f8f29f 100644 (file)
--- 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 c0f91c7562775073259701570530943aaa47f5c8..f38263cd944b0aa9c22313f9a29216397dc08e06 100644 (file)
--- 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 039fc7b719e0d67ce0c3c19d47b13a36903667bc..1643446c763791a61c136074ad7e6263d33ef64e 100644 (file)
--- 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 da6ae9ac5590fffda81431e5798f783211855334..87274eeb6d9105280c49ac7904fa3d6fbaa319f2 100644 (file)
--- 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 66eb6a2002c7f71ebd48cbfa82493d39b6fa4f26..499c31408f6dbe3a2c474862d4d31e05aca92560 100644 (file)
--- 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 26c589d03e96d055fc2232c67e271b4927a72de7..5d057edb0a62ea047901854ad8ebda3f92c16d76 100644 (file)
--- 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 ca05285a09b20ce6f3a9915580598fbb0537627b..8c47246ae8b4c5140098b53ae65e4194cbd53ed9 100644 (file)
--- 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 c1d4c612df81ccec7a701e378774951ac6540366..00e5e792e19125b18d60be920b916b8790d33f2c 100644 (file)
--- 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 7dfbd412f6dd07e8e61226c937ec4a0a709f3095..cc64e44c0f766984012b7fff401bc8267d676d28 100644 (file)
--- 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 b899442c25ae7aff40a08d44409e6c9ebacc6216..19b2e5ff87c28888e2ea585637f664019052d0b5 100644 (file)
--- 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 1eb75a6397fa70f9c7612b6474cb78ce21dfef85..414948f1831161d46331ad26120fe6c1cbf4e9e6 100644 (file)
--- 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 10f99f340b83e84aa3e210a1d07f21f74d58080c..a3e512c4423839cd0a31501849482ac4f0cdd543 100644 (file)
--- 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 109e19a292df42638ffa5c2bd2de740e0aa500e9..f1d84b5a446094bb453376406624c1c467cb821b 100644 (file)
--- 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 8ec0216810684e04130dd69067a73a32349432b0..3c7cac809eb7d0c68c9390c9dca32799318d0f5c 100644 (file)
--- 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 6addf2bc8b4d5178007a07483a5f5f41217507a2..8f5de2169953fe21185282f960e697d4a19a70a2 100644 (file)
--- 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 a72f5e0a7a546563450c1067073edea0acf888bd..3a10b0220d1bf24c873806c6459939bfcb5d6b35 100644 (file)
--- 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 7dd1fe75e041c24f883fcfa4d8060725fb427689..72594993853bdd2048d99b3d17f88ab64d806c6e 100644 (file)
--- 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 291c2a43d4d94d07873cb80bd7c8f38f0689fbe8..67c9faeca57aefbcc8c1909b79b2acc05fc1405e 100644 (file)
--- 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 213caa75238ad02b0175ac694d4cf0ce731a9a14..5f4d5ced78ff6fc3293c7e17c9af848f4a23a2c1 100644 (file)
--- 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 c4f506df62d21d25af9020209a8c8b801d0b8dcf..3465b4d1821d860fa8d5aa6f7ca4ec982b044b28 100644 (file)
--- 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 ea57d280cb8d909ecdf266175453688b51ff4ea3..580613068b1d22801209f46d63d955e224d0e86f 100644 (file)
--- 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 }