From 4aeb939e77e4c43195be64a07e6035d3f7af9e91 Mon Sep 17 00:00:00 2001 From: Adam Ford Date: Thu, 9 Aug 2018 06:15:13 -0500 Subject: [PATCH] ARM: davinci: da850evm: Support DM_MMC With the updated driver available to support DM_MMC, this patch enables DM_MMC for da850evm. Signed-off-by: Adam Ford --- board/davinci/da8xxevm/da850evm.c | 2 ++ configs/da850evm_defconfig | 1 + 2 files changed, 3 insertions(+) diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c index 5583b45792..e8ec553f99 100644 --- a/board/davinci/da8xxevm/da850evm.c +++ b/board/davinci/da8xxevm/da850evm.c @@ -204,6 +204,7 @@ int misc_init_r(void) return 0; } +#ifndef CONFIG_DM_MMC #ifdef CONFIG_MMC_DAVINCI static struct davinci_mmc mmc_sd0 = { .reg_base = (struct davinci_mmc_regs *)DAVINCI_MMC_SD0_BASE, @@ -220,6 +221,7 @@ int board_mmc_init(bd_t *bis) return davinci_mmc_init(bis, &mmc_sd0); } #endif +#endif static const struct pinmux_config gpio_pins[] = { #ifdef CONFIG_USE_NOR diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig index e81efe8227..c30f396e65 100644 --- a/configs/da850evm_defconfig +++ b/configs/da850evm_defconfig @@ -43,6 +43,7 @@ CONFIG_DM_GPIO=y CONFIG_DA8XX_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_DAVINCI=y +CONFIG_DM_MMC=y CONFIG_MTD_DEVICE=y CONFIG_MTD_PARTITIONS=y CONFIG_DM_SPI_FLASH=y -- 2.39.5