LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: rmobile: Handle R8A7796 r1.1 in the PRR code 

The R8A7796 r1.1 reports itself as r2.0 , add quirk into the
PRR code to fix this report.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
This commit is contained in:
Marek Vasut 2017-05-13 15:57:38 +02:00 committed by Nobuhiro Iwamatsu
parent bc271a0051
commit e965c89008
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/arm/mach-rmobile/cpu_info-rcar.c
View File

@ -9,6 +9,9 @@
#include <asm/io.h> #include <asm/io.h>
#define PRR 0xFF000044 #define PRR 0xFF000044
#define PRR_MASK 0x7fff
#define R8A7796_REV_1_0 0x5200
#define R8A7796_REV_1_1 0x5210
u32 rmobile_get_cpu_type(void) u32 rmobile_get_cpu_type(void)
{ {
@ -17,10 +20,20 @@ u32 rmobile_get_cpu_type(void)
u32 rmobile_get_cpu_rev_integer(void) u32 rmobile_get_cpu_rev_integer(void)
{ {
return ((readl(PRR) & 0x000000F0) >> 4) + 1; const u32 prr = readl(PRR);
if ((prr & PRR_MASK) == R8A7796_REV_1_1)
return 1;
else
return ((prr & 0x000000F0) >> 4) + 1;
} }
u32 rmobile_get_cpu_rev_fraction(void) u32 rmobile_get_cpu_rev_fraction(void)
{ {
return readl(PRR) & 0x0000000F; const u32 prr = readl(PRR);
if ((prr & PRR_MASK) == R8A7796_REV_1_1)
return 1;
else
return prr & 0x0000000F;
} }