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 <marek.vasut+renesas@mailbox.org>
Signed-off-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
Signed-off-by: Hai Pham <hai.pham.ud@renesas.com>
[Marek: Slight update to commit message, spell out the SoC model]

diff --git a/arch/arm/mach-rmobile/cpu_info.c b/arch/arm/mach-rmobile/cpu_info.c
index 71a856ea8796726e10118ec51abd8b3fd2794898..1d33e2aa9da361e78574a85d6f93bb061df7e224 100644 (file)
--- 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());