michael/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
- Fix R-Car D3 ability to boot Linux kernel.
This commit is contained in:
Tom Rini
2025-12-29 16:38:22 -06:00
parent 56cac250b0 06df1a5072
commit 556631ffde
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/clk/renesas/r8a77995-cpg-mssr.c
View File

@@ -216,18 +216,18 @@ static const struct rcar_gen3_cpg_pll_config cpg_pll_configs[2] __initconst = {
};
static const struct mstp_stop_table r8a77995_mstp_table[] = {
{ 0x00210000, 0x0, 0x00210000, 0 },
{ 0x03e01000, 0x0, 0x03e01000, 0 },
{ 0x000e2fdc, 0x2000, 0x000e2fd8, 0 },
{ 0xc00014df, 0x400, 0xc00014df, 0 },
{ 0x80000004, 0x180, 0x80000004, 0 },
{ 0x40d20004, 0x0, 0x40d20004, 0 },
{ 0x08c0008c, 0x0, 0x08c0008c, 0 },
{ 0x09941c18, 0x0, 0x09941c18, 0 },
{ 0x00801087, 0x0, 0x00801087, 0 },
{ 0xf143dfc0, 0x0, 0xf143dfc0, 0 },
{ 0x063e1820, 0x0, 0x063e1820, 0 },
{ 0x00000000, 0x0, 0x00000000, 0 },
{ 0x00210000, 0x0, 0, 0 },
{ 0x03e01000, 0x0, 0, 0 },
{ 0x000e2fdc, 0x2000, 0, 0 },
{ 0xc00014df, 0x400, 0, 0 },
{ 0x80000004, 0x80, 0, 0 },
{ 0x40d20004, 0x0, 0, 0 },
{ 0x08c0008c, 0x0, 0, 0 },
{ 0x09941c18, 0x0, 0, 0 },
{ 0x00801087, 0x0, 0, 0 },
{ 0xf143dfc0, 0x0, 0, 0 },
{ 0x063e1820, 0x0, 0, 0 },
{ 0x00000000, 0x0, 0, 0 },
};
static const void *r8a77995_get_pll_config(const u32 cpg_mode)

3
drivers/clk/renesas/renesas-cpg-mssr.c
View File

@@ -127,7 +127,8 @@ int renesas_clk_remove(void __iomem *base, struct cpg_mssr_info *info)
info->mstp_table[i].sdis,
info->mstp_table[i].sen);
if (info->reg_layout == CLK_REG_LAYOUT_RCAR_GEN4)
if (info->reg_layout == CLK_REG_LAYOUT_RCAR_GEN4 ||
renesas_get_cpu_type() == RENESAS_CPU_TYPE_R8A77995)
continue;
clrsetbits_le32(base + RMSTPCR(i),