ARM: renesas: Rename RMOBILE_CPU_TYPE_* to RENESAS_CPU_TYPE_*
Rename RMOBILE_CPU_TYPE_* to RENESAS_CPU_TYPE_* 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 '\<RMOBILE_CPU_TYPE_[A-Z0-9]\+\>' | \
xargs -I {} sed -i 's@\<RMOBILE\(_CPU_TYPE_[A-Z0-9]\+\)\>@RENESAS\1@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 ce7cc2a..a1683a26 100644
--- a/arch/arm/mach-rmobile/cpu_info-rzg2l.c
+++ b/arch/arm/mach-rmobile/cpu_info-rzg2l.c
@@ -21,7 +21,7 @@
};
static const struct tfa_info tfa_info[] = {
- { "renesas,r9a07g044l2", "R9A07G044L", RMOBILE_CPU_TYPE_R9A07G044L },
+ { "renesas,r9a07g044l2", "R9A07G044L", RENESAS_CPU_TYPE_R9A07G044L },
};
static const struct tfa_info invalid_tfa_info = { NULL, "(invalid)", 0 };
diff --git a/arch/arm/mach-rmobile/cpu_info.c b/arch/arm/mach-rmobile/cpu_info.c
index 35cfef2..9c5ea4e 100644
--- a/arch/arm/mach-rmobile/cpu_info.c
+++ b/arch/arm/mach-rmobile/cpu_info.c
@@ -62,22 +62,22 @@
u16 cpu_type;
u8 cpu_name[10];
} rmobile_cpuinfo[] = {
- { RMOBILE_CPU_TYPE_R8A7790, "R8A7790" },
- { RMOBILE_CPU_TYPE_R8A7791, "R8A7791" },
- { RMOBILE_CPU_TYPE_R8A7792, "R8A7792" },
- { RMOBILE_CPU_TYPE_R8A7793, "R8A7793" },
- { RMOBILE_CPU_TYPE_R8A7794, "R8A7794" },
- { RMOBILE_CPU_TYPE_R8A7795, "R8A7795" },
- { RMOBILE_CPU_TYPE_R8A7796, "R8A7796" },
- { RMOBILE_CPU_TYPE_R8A77965, "R8A77965" },
- { RMOBILE_CPU_TYPE_R8A77970, "R8A77970" },
- { RMOBILE_CPU_TYPE_R8A77980, "R8A77980" },
- { RMOBILE_CPU_TYPE_R8A77990, "R8A77990" },
- { RMOBILE_CPU_TYPE_R8A77995, "R8A77995" },
- { RMOBILE_CPU_TYPE_R8A779A0, "R8A779A0" },
- { RMOBILE_CPU_TYPE_R8A779F0, "R8A779F0" },
- { RMOBILE_CPU_TYPE_R8A779G0, "R8A779G0" },
- { RMOBILE_CPU_TYPE_R8A779H0, "R8A779H0" },
+ { RENESAS_CPU_TYPE_R8A7790, "R8A7790" },
+ { RENESAS_CPU_TYPE_R8A7791, "R8A7791" },
+ { RENESAS_CPU_TYPE_R8A7792, "R8A7792" },
+ { RENESAS_CPU_TYPE_R8A7793, "R8A7793" },
+ { RENESAS_CPU_TYPE_R8A7794, "R8A7794" },
+ { RENESAS_CPU_TYPE_R8A7795, "R8A7795" },
+ { RENESAS_CPU_TYPE_R8A7796, "R8A7796" },
+ { RENESAS_CPU_TYPE_R8A77965, "R8A77965" },
+ { RENESAS_CPU_TYPE_R8A77970, "R8A77970" },
+ { RENESAS_CPU_TYPE_R8A77980, "R8A77980" },
+ { RENESAS_CPU_TYPE_R8A77990, "R8A77990" },
+ { RENESAS_CPU_TYPE_R8A77995, "R8A77995" },
+ { RENESAS_CPU_TYPE_R8A779A0, "R8A779A0" },
+ { RENESAS_CPU_TYPE_R8A779F0, "R8A779F0" },
+ { RENESAS_CPU_TYPE_R8A779G0, "R8A779G0" },
+ { RENESAS_CPU_TYPE_R8A779H0, "R8A779H0" },
{ 0x0, "CPU" },
};
@@ -121,7 +121,7 @@
{
int i = rmobile_cpuinfo_idx();
- if (rmobile_cpuinfo[i].cpu_type == RMOBILE_CPU_TYPE_R8A7796 &&
+ if (rmobile_cpuinfo[i].cpu_type == RENESAS_CPU_TYPE_R8A7796 &&
renesas_get_cpu_rev_integer() == 1 &&
renesas_get_cpu_rev_fraction() == 1) {
printf("CPU: Renesas Electronics %s rev 1.1/1.2\n", get_cpu_name(i));
diff --git a/arch/arm/mach-rmobile/include/mach/rmobile.h b/arch/arm/mach-rmobile/include/mach/rmobile.h
index d41b737..67c4800 100644
--- a/arch/arm/mach-rmobile/include/mach/rmobile.h
+++ b/arch/arm/mach-rmobile/include/mach/rmobile.h
@@ -25,24 +25,24 @@
#endif /* CONFIG_ARCH_RMOBILE */
/* PRR CPU IDs */
-#define RMOBILE_CPU_TYPE_R8A7740 0x40
-#define RMOBILE_CPU_TYPE_R8A7790 0x45
-#define RMOBILE_CPU_TYPE_R8A7791 0x47
-#define RMOBILE_CPU_TYPE_R8A7792 0x4A
-#define RMOBILE_CPU_TYPE_R8A7793 0x4B
-#define RMOBILE_CPU_TYPE_R8A7794 0x4C
-#define RMOBILE_CPU_TYPE_R8A7795 0x4F
-#define RMOBILE_CPU_TYPE_R8A7796 0x52
-#define RMOBILE_CPU_TYPE_R8A77965 0x55
-#define RMOBILE_CPU_TYPE_R8A77970 0x54
-#define RMOBILE_CPU_TYPE_R8A77980 0x56
-#define RMOBILE_CPU_TYPE_R8A77990 0x57
-#define RMOBILE_CPU_TYPE_R8A77995 0x58
-#define RMOBILE_CPU_TYPE_R8A779A0 0x59
-#define RMOBILE_CPU_TYPE_R8A779F0 0x5A
-#define RMOBILE_CPU_TYPE_R8A779G0 0x5C
-#define RMOBILE_CPU_TYPE_R8A779H0 0x5D
-#define RMOBILE_CPU_TYPE_R9A07G044L 0x9A070440
+#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>