From f0aa1254776cbc0406d9b0b794479490799c3c47 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 16 May 2019 13:03:57 +0300 Subject: [PATCH] arm: mvebu: fix ahci mbus config in SPL SPL does not initialize mbus_dram_info. Don't change the ahci mbus settings of the ROM. This allows the ahci to work in SPL. Signed-off-by: Baruch Siach Reviewed-by: Chris Packham Signed-off-by: Stefan Roese --- arch/arm/mach-mvebu/cpu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index f09e7b10e9..f4b7a4fa80 100644 --- a/arch/arm/mach-mvebu/cpu.c +++ b/arch/arm/mach-mvebu/cpu.c @@ -542,6 +542,10 @@ static void ahci_mvebu_mbus_config(void __iomem *base) const struct mbus_dram_target_info *dram; int i; + /* mbus is not initialized in SPL; keep the ROM settings */ + if (IS_ENABLED(CONFIG_SPL_BUILD)) + return; + dram = mvebu_mbus_dram_info(); for (i = 0; i < 4; i++) { -- 2.39.5