diff mbox series

arm: rmobile: Identify R8A7796 r1.3 SoC

Message ID 20200915141522.4120-1-biju.das.jz@bp.renesas.com
State Accepted
Commit 7d7913689a54ca4173f08c9c854789b7f6aec12e
Delegated to: Marek Vasut
Headers show
Series arm: rmobile: Identify R8A7796 r1.3 SoC | expand

Commit Message

Biju Das Sept. 15, 2020, 2:15 p.m. UTC 
Add support to identify R8A7796 r1.3 SoC.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
 arch/arm/mach-rmobile/cpu_info-rcar.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Comments

Marek Vasut Sept. 16, 2020, 1:54 p.m. UTC | #1 
On 9/15/20 4:15 PM, Biju Das wrote:
> Add support to identify R8A7796 r1.3 SoC.

Applied to sh/next, thanks.
diff mbox series

Patch

diff --git a/arch/arm/mach-rmobile/cpu_info-rcar.c b/arch/arm/mach-rmobile/cpu_info-rcar.c
index ce9312f9d8..5bde24ae0e 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;
 }