From 08260efdaf538411623471f517b3da63060251dd Mon Sep 17 00:00:00 2001 From: Hiroyuki Yokoyama Date: Wed, 26 Sep 2018 18:14:41 +0900 Subject: [PATCH] ARM: rmobile: Identify R-Car M3-W R8A7796 r1.1/1.2 SoC r8a7796 cpu revision v1.2 has the same information as revision v1.1. This patch fixes revision display at startup to "rev 1.1/1.2". Reviewed-by: Marek Vasut Signed-off-by: Hiroyuki Yokoyama Signed-off-by: Hai Pham [Marek: Slight update to commit message, spell out the SoC model] --- arch/arm/mach-rmobile/cpu_info.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/mach-rmobile/cpu_info.c b/arch/arm/mach-rmobile/cpu_info.c index 71a856ea87..1d33e2aa9d 100644 --- a/arch/arm/mach-rmobile/cpu_info.c +++ b/arch/arm/mach-rmobile/cpu_info.c @@ -120,6 +120,13 @@ int print_cpuinfo(void) { int i = rmobile_cpuinfo_idx(); + if (rmobile_cpuinfo[i].cpu_type == RMOBILE_CPU_TYPE_R8A7796 && + rmobile_get_cpu_rev_integer() == 1 && + rmobile_get_cpu_rev_fraction() == 1) { + printf("CPU: Renesas Electronics %s rev 1.1/1.2\n", get_cpu_name(i)); + return 0; + } + printf("CPU: Renesas Electronics %s rev %d.%d\n", get_cpu_name(i), rmobile_get_cpu_rev_integer(), rmobile_get_cpu_rev_fraction()); -- 2.39.5