diff options
| author | Sekhar Nori <[email protected]> | 2019-05-30 19:04:54 +0530 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-06-05 12:13:46 -0400 |
| commit | 4fddaf2b7d4ab23ec829bb208c892789447779e0 (patch) | |
| tree | 5cf497cc63269b2142bc3a2e98c8ddf51a4c26ec | |
| parent | 7a56c930e226c721bb7400f9a376c824ec708cbb (diff) | |
ARM: davinci: omal138_lcdk: fix MMC boot breakage due to driver model conversion
commit 21af33ed0319 ("ARM: davinci: omapl138_lcdk: Enable DM_MMC")
wanted to enable DM_MMC only for U-Boot and not for SPL.
But CONFIG_DM_MMC is defined for SPL build too. Because of this
MMC device was not getting registered for SPL causing MMC/SD
boot breakage.
Instead use CONFIG_IS_ENABLED(DM_MMC) which will remain false until
CONFIG_SPL_DM_MMC is defined.
Tested-by: Adam Ford <[email protected]> #da850evm
Signed-off-by: Sekhar Nori <[email protected]>
Tested-by: Peter Howard <[email protected]> #omapl138_lcdk
| -rw-r--r-- | board/davinci/da8xxevm/omapl138_lcdk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c index 2c2f885d43e..fe1bf441014 100644 --- a/board/davinci/da8xxevm/omapl138_lcdk.c +++ b/board/davinci/da8xxevm/omapl138_lcdk.c @@ -353,7 +353,7 @@ int misc_init_r(void) return 0; } -#ifndef CONFIG_DM_MMC +#if !CONFIG_IS_ENABLED(DM_MMC) #ifdef CONFIG_MMC_DAVINCI static struct davinci_mmc mmc_sd0 = { .reg_base = (struct davinci_mmc_regs *)DAVINCI_MMC_SD0_BASE, |