rockchip: evb-rk3288: add -u-boot.dtsi

[oweals/u-boot.git] / arch / arm / mach-mvebu / cpu.c

diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index 9868462867092d67deb9f13f57476ee5bd55d119..f4b7a4fa80108176784794cfab8d577c784a1f3c 100644 (file)
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -499,6 +499,8 @@ u32 mvebu_get_nand_clock(void)
 
        if (mvebu_soc_family() == MVEBU_SOC_A38X)
                reg = MVEBU_DFX_DIV_CLK_CTRL(1);
+       else if (mvebu_soc_family() == MVEBU_SOC_MSYS)
+               reg = MVEBU_DFX_DIV_CLK_CTRL(8);
        else
                reg = MVEBU_CORE_DIV_CLK_CTRL(1);
 
@@ -518,7 +520,7 @@ int arch_misc_init(void)
 }
 #endif /* CONFIG_ARCH_MISC_INIT */
 
-#ifdef CONFIG_MMC_SDHCI_MV
+#if defined(CONFIG_MMC_SDHCI_MV) && !defined(CONFIG_DM_MMC)
 int board_mmc_init(bd_t *bis)
 {
        mv_sdh_init(MVEBU_SDIO_BASE, 0, 0,
@@ -540,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++) {