diff options
| author | Tom Rini <trini@konsulko.com> | 2023-06-08 18:22:32 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-06-08 18:22:32 -0400 |
| commit | 681bfd6b46c7e3bb48c486e22906cc5d88be433d (patch) | |
| tree | 2ab591c82792bbf88b0b2817dade34063fb53909 /arch | |
| parent | 661332a0744dad6a1a4bfbbdea2a4e5ae9835e52 (diff) | |
| parent | b597b6f9861c2d5531b0055249622ee0e663577c (diff) | |
Merge branch 'master_soc/fixes' of https://source.denx.de/u-boot/custodians/u-boot-sh
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-rmobile/cpu_info-rcar.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-rmobile/cpu_info.c | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/arch/arm/mach-rmobile/cpu_info-rcar.c b/arch/arm/mach-rmobile/cpu_info-rcar.c index 62017f52c3..8fc4cd7f9d 100644 --- a/arch/arm/mach-rmobile/cpu_info-rcar.c +++ b/arch/arm/mach-rmobile/cpu_info-rcar.c @@ -11,6 +11,7 @@ #define R8A7796_REV_1_0 0x5200 #define R8A7796_REV_1_1 0x5210 #define R8A7796_REV_1_3 0x5211 +#define R8A77995_REV_1_1 0x5810 static u32 rmobile_get_prr(void) { @@ -30,7 +31,8 @@ u32 rmobile_get_cpu_rev_integer(void) const u32 prr = rmobile_get_prr(); const u32 rev = prr & PRR_MASK; - if (rev == R8A7796_REV_1_1 || rev == R8A7796_REV_1_3) + if (rev == R8A7796_REV_1_1 || rev == R8A7796_REV_1_3 || + rev == R8A77995_REV_1_1) return 1; else return ((prr & 0x000000F0) >> 4) + 1; @@ -41,7 +43,7 @@ u32 rmobile_get_cpu_rev_fraction(void) const u32 prr = rmobile_get_prr(); const u32 rev = prr & PRR_MASK; - if (rev == R8A7796_REV_1_1) + if (rev == R8A7796_REV_1_1 || rev == R8A77995_REV_1_1) return 1; else if (rev == R8A7796_REV_1_3) return 3; diff --git a/arch/arm/mach-rmobile/cpu_info.c b/arch/arm/mach-rmobile/cpu_info.c index 71a856ea87..1d33e2aa9d 100644 --- 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()); |