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 <[email protected]>
Reviewed-by: Chris Packham <[email protected]>
Signed-off-by: Stefan Roese <[email protected]>

diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index f09e7b10e935305a197b9f13640eed16339465ff..f4b7a4fa80108176784794cfab8d577c784a1f3c 100644 (file)
--- 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++) {