u-boot (Allwinner): rebase patches for 2024.04

This commit is contained in:
Rudi Heitbaum 2024-04-03 11:47:45 +00:00
parent e54dcc6c1c
commit a591192cbd

View File

@ -23,19 +23,19 @@ diff --git a/arch/arm/mach-sunxi/dram_helpers.c b/arch/arm/mach-sunxi/dram_helpe
index cdf2750f1c..5758c58e07 100644 index cdf2750f1c..5758c58e07 100644
--- a/arch/arm/mach-sunxi/dram_helpers.c --- a/arch/arm/mach-sunxi/dram_helpers.c
+++ b/arch/arm/mach-sunxi/dram_helpers.c +++ b/arch/arm/mach-sunxi/dram_helpers.c
@@ -32,6 +32,7 @@ void mctl_await_completion(u32 *reg, u32 mask, u32 val) @@ -41,6 +41,7 @@ void mctl_await_completion(u32 *reg, u32 mask, u32 val)
#ifndef CONFIG_MACH_SUNIV val_base = readl(base);
bool mctl_mem_matches(u32 offset) val_offset = readl(base + offset);
{
+ dsb(); + dsb();
/* Try to write different values to RAM at two addresses */ /* Try to write different values to RAM at two addresses */
writel(0, CFG_SYS_SDRAM_BASE); writel(0, base);
writel(0xaa55aa55, (ulong)CFG_SYS_SDRAM_BASE + offset); writel(0xaa55aa55, base + offset);
diff --git a/arch/arm/mach-sunxi/dram_sun50i_h6.c b/arch/arm/mach-sunxi/dram_sun50i_h6.c diff --git a/arch/arm/mach-sunxi/dram_sun50i_h6.c b/arch/arm/mach-sunxi/dram_sun50i_h6.c
index bff2e42513..a031a845f5 100644 index bff2e42513..a031a845f5 100644
--- a/arch/arm/mach-sunxi/dram_sun50i_h6.c --- a/arch/arm/mach-sunxi/dram_sun50i_h6.c
+++ b/arch/arm/mach-sunxi/dram_sun50i_h6.c +++ b/arch/arm/mach-sunxi/dram_sun50i_h6.c
@@ -623,6 +623,8 @@ static void mctl_auto_detect_dram_size(struct dram_para *para) @@ -621,6 +621,8 @@ static void mctl_auto_detect_dram_size(struct dram_para *para)
para->cols = 11; para->cols = 11;
mctl_core_init(para); mctl_core_init(para);