From 7d7913689a54ca4173f08c9c854789b7f6aec12e Mon Sep 17 00:00:00 2001 From: Biju Das Date: Tue, 15 Sep 2020 15:15:22 +0100 Subject: [PATCH] arm: rmobile: Identify R8A7796 r1.3 SoC Add support to identify R8A7796 r1.3 SoC. Signed-off-by: Biju Das Reviewed-by: Lad Prabhakar --- arch/arm/mach-rmobile/cpu_info-rcar.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-rmobile/cpu_info-rcar.c b/arch/arm/mach-rmobile/cpu_info-rcar.c index ce9312f..5bde24a 100644 --- a/arch/arm/mach-rmobile/cpu_info-rcar.c +++ b/arch/arm/mach-rmobile/cpu_info-rcar.c @@ -10,6 +10,7 @@ #define PRR_MASK 0x7fff #define R8A7796_REV_1_0 0x5200 #define R8A7796_REV_1_1 0x5210 +#define R8A7796_REV_1_3 0x5211 static u32 rmobile_get_prr(void) { @@ -28,8 +29,9 @@ u32 rmobile_get_cpu_type(void) u32 rmobile_get_cpu_rev_integer(void) { const u32 prr = rmobile_get_prr(); + const u32 rev = prr & PRR_MASK; - if ((prr & PRR_MASK) == R8A7796_REV_1_1) + if (rev == R8A7796_REV_1_1 || rev == R8A7796_REV_1_3) return 1; else return ((prr & 0x000000F0) >> 4) + 1; @@ -38,9 +40,12 @@ u32 rmobile_get_cpu_rev_integer(void) u32 rmobile_get_cpu_rev_fraction(void) { const u32 prr = rmobile_get_prr(); + const u32 rev = prr & PRR_MASK; - if ((prr & PRR_MASK) == R8A7796_REV_1_1) + if (rev == R8A7796_REV_1_1) return 1; + else if (rev == R8A7796_REV_1_3) + return 3; else return prr & 0x0000000F; } -- 2.7.4