From 21af33ed0319b1a5133ea78a4261b5464e1a6a1b Mon Sep 17 00:00:00 2001 From: Adam Ford Date: Thu, 9 Aug 2018 06:15:14 -0500 Subject: [PATCH] ARM: davinci: omapl138_lcdk: Enable DM_MMC With DM_MMC now available, this patch enables DM_MMC for the omapl138_lcdk in U-Boot and keeps the older style for SPL. Signed-off-by: Peter Howard Signed-off-by: Adam Ford --- board/davinci/da8xxevm/omapl138_lcdk.c | 2 ++ configs/omapl138_lcdk_defconfig | 1 + 2 files changed, 3 insertions(+) diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c index 15ffc3b..2c2f885 100644 --- a/board/davinci/da8xxevm/omapl138_lcdk.c +++ b/board/davinci/da8xxevm/omapl138_lcdk.c @@ -353,6 +353,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, @@ -369,3 +370,4 @@ int board_mmc_init(bd_t *bis) return davinci_mmc_init(bis, &mmc_sd0); } #endif +#endif diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig index 96311af..e3a06c8 100644 --- a/configs/omapl138_lcdk_defconfig +++ b/configs/omapl138_lcdk_defconfig @@ -37,6 +37,7 @@ CONFIG_DM=y CONFIG_DM_I2C=y CONFIG_DM_I2C_COMPAT=y CONFIG_SYS_I2C_DAVINCI=y +CONFIG_DM_MMC=y CONFIG_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y