mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-23 20:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

mmc: mmc_get_op_cond: Allow quiet detection of eMMC

Browse Source 
Add a new 'quiet' argument to mmc_get_op_cond() function which avoids
printing error message when SD/eMMC card is not detected.

Espressobin and mx6cuboxi boards use this function for detecting presence
of eMMC and therefore it is expected and normal that eMMC does not have to
be connected. So error message "Card did not respond to voltage select!"
should be skipped in this case as it is not an error.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>
Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
This commit is contained in:
Pali Rohár 2021-07-14 16:37:29 +02:00 committed by Stefan Roese
parent 42ba56691c
commit a4c577f981
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/Marvell/mvebu_armada-37xx/board.c
View File

@ -124,7 +124,7 @@ int board_late_init(void)
/* eMMC is mmc dev num 1 */
mmc_dev = find_mmc_device(1);
emmc = (mmc_dev && mmc_get_op_cond(mmc_dev) == 0);
emmc = (mmc_dev && mmc_get_op_cond(mmc_dev, true) == 0);
/* if eMMC is not present then remove it from DM */
if (!emmc && mmc_dev) {

2
board/solidrun/mx6cuboxi/mx6cuboxi.c
View File

@ -374,7 +374,7 @@ static bool has_emmc(void)
mmc = find_mmc_device(2);
if (!mmc)
return 0;
return (mmc_get_op_cond(mmc) < 0) ? 0 : 1;
return (mmc_get_op_cond(mmc, true) < 0) ? 0 : 1;
}
int checkboard(void)

7
drivers/mmc/mmc.c
View File

@ -2766,7 +2766,7 @@ static int mmc_power_cycle(struct mmc *mmc)
return mmc_power_on(mmc);
}
int mmc_get_op_cond(struct mmc *mmc)
int mmc_get_op_cond(struct mmc *mmc, bool quiet)
{
bool uhs_en = supports_uhs(mmc->cfg->host_caps);
int err;
@ -2842,7 +2842,8 @@ retry:
if (err) {
#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
pr_err("Card did not respond to voltage select! : %d\n", err);
if (!quiet)
pr_err("Card did not respond to voltage select! : %d\n", err);
#endif
return -EOPNOTSUPP;
}
@ -2882,7 +2883,7 @@ int mmc_start_init(struct mmc *mmc)
return -ENOMEDIUM;
}
err = mmc_get_op_cond(mmc);
err = mmc_get_op_cond(mmc, false);
if (!err)
mmc->init_in_progress = 1;

3
include/mmc.h
View File

@ -900,9 +900,10 @@ int mmc_set_bkops_enable(struct mmc *mmc);
* the presence of SD/eMMC when no card detect logic is available.
*
* @param mmc Pointer to a MMC device struct
* @param quiet Be quiet, do not print error messages when card is not detected.
* @return 0 on success, <0 on error.
*/
int mmc_get_op_cond(struct mmc *mmc);
int mmc_get_op_cond(struct mmc *mmc, bool quiet);
/**
* Start device initialization and return immediately; it does not block on