diff options
| -rw-r--r-- | drivers/mmc/mmc.c | 7 | ||||
| -rw-r--r-- | plat/hisilicon/hikey/hikey_bl2_setup.c | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 418ab112..02bf770e 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -246,6 +246,13 @@ static int mmc_fill_device_info(void) return ret; } + do { + ret = mmc_device_state(); + if (ret < 0) { + return ret; + } + } while (ret != MMC_STATE_TRAN); + nb_blocks = (mmc_ext_csd[CMD_EXTCSD_SEC_CNT] << 0) | (mmc_ext_csd[CMD_EXTCSD_SEC_CNT + 1] << 8) | (mmc_ext_csd[CMD_EXTCSD_SEC_CNT + 2] << 16) | diff --git a/plat/hisilicon/hikey/hikey_bl2_setup.c b/plat/hisilicon/hikey/hikey_bl2_setup.c index d42afe0d..125d6654 100644 --- a/plat/hisilicon/hikey/hikey_bl2_setup.c +++ b/plat/hisilicon/hikey/hikey_bl2_setup.c @@ -336,7 +336,6 @@ void bl2_platform_setup(void) params.flags = MMC_FLAG_CMD23; info.mmc_dev_type = MMC_IS_EMMC; dw_mmc_init(¶ms, &info); - mdelay(20); hikey_io_setup(); } |