Skip to contentSkip to conversation

arm: rmobile: Identify R8A7796 r1.3 SoC

PATCH New Biju Das 2 participants 2 messages Sep 15, 2020 – Sep 16, 2020

Subsystems (3)
lore
Share & tools
lore

Biju Das

author
#0 lore raw

PATCH 1/1 arm: rmobile: Identify R8A7796 r1.3 SoC

Add support to identify R8A7796 r1.3 SoC.

---
 arch/arm/mach-rmobile/cpu_info-rcar.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
arch/arm/mach-rmobile/cpu_info-rcar.c +7 -2
index ce9312f9d8..5bde24ae0e 100644
@@ -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;
 }
Signature · 1 line
2.17.1
Applied
#1 lore raw

PATCH 1/1 arm: rmobile: Identify R8A7796 r1.3 SoC

Quoted 1 line · Biju Das

Add support to identify R8A7796 r1.3 SoC.

Applied to sh/next, thanks.