mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-08-21 14:41:26 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master_soc/fixes' of https://source.denx.de/u-boot/custodians/u-boot-sh

Browse Source
This commit is contained in:
Tom Rini 2023-06-08 18:22:32 -04:00
commit 681bfd6b46
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@
#define R8A7796_REV_1_0 0x5200 #define R8A7796_REV_1_0 0x5200
#define R8A7796_REV_1_1 0x5210 #define R8A7796_REV_1_1 0x5210
#define R8A7796_REV_1_3 0x5211 #define R8A7796_REV_1_3 0x5211
#define R8A77995_REV_1_1 0x5810
static u32 rmobile_get_prr(void) 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 prr = rmobile_get_prr();
const u32 rev = prr & PRR_MASK; 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; return 1;
else else
return ((prr & 0x000000F0) >> 4) + 1; return ((prr & 0x000000F0) >> 4) + 1;
@ -41,7 +43,7 @@ u32 rmobile_get_cpu_rev_fraction(void)
const u32 prr = rmobile_get_prr(); const u32 prr = rmobile_get_prr();
const u32 rev = prr & PRR_MASK; 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; return 1;
else if (rev == R8A7796_REV_1_3) else if (rev == R8A7796_REV_1_3)
return 3; return 3;

7
arch/arm/mach-rmobile/cpu_info.c
View File

@ -120,6 +120,13 @@ int print_cpuinfo(void)
{ {
int i = rmobile_cpuinfo_idx(); 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", printf("CPU: Renesas Electronics %s rev %d.%d\n",
get_cpu_name(i), rmobile_get_cpu_rev_integer(), get_cpu_name(i), rmobile_get_cpu_rev_integer(),
rmobile_get_cpu_rev_fraction()); rmobile_get_cpu_rev_fraction());

8
drivers/pinctrl/renesas/pfc-r8a779a0.c
View File

@ -699,16 +699,8 @@ static const u16 pinmux_data[] = {
PINMUX_SINGLE(PCIE0_CLKREQ_N), PINMUX_SINGLE(PCIE0_CLKREQ_N),
PINMUX_SINGLE(AVB0_PHY_INT), PINMUX_SINGLE(AVB0_PHY_INT),
PINMUX_SINGLE(AVB0_MAGIC),
PINMUX_SINGLE(AVB0_MDC),
PINMUX_SINGLE(AVB0_MDIO),
PINMUX_SINGLE(AVB0_TXCREFCLK),
PINMUX_SINGLE(AVB1_PHY_INT), PINMUX_SINGLE(AVB1_PHY_INT),
PINMUX_SINGLE(AVB1_MAGIC),
PINMUX_SINGLE(AVB1_MDC),
PINMUX_SINGLE(AVB1_MDIO),
PINMUX_SINGLE(AVB1_TXCREFCLK),
PINMUX_SINGLE(AVB2_AVTP_PPS), PINMUX_SINGLE(AVB2_AVTP_PPS),
PINMUX_SINGLE(AVB2_AVTP_CAPTURE), PINMUX_SINGLE(AVB2_AVTP_CAPTURE),