commit 141a07a42725e8becfe842545ffcc4c2f4328e0d
author Antonio Niño Díaz <antonio.ninodiaz@arm.com> Thu Nov 29 16:05:17 2018 +0100
committer GitHub <noreply@github.com> Thu Nov 29 16:05:17 2018 +0100
tree fe7b3d7cbf48851aee4f1fae5c78d46333c13fd5
parent b4b08d795868e83bbdaecb34ec3e0740f44feb60
parent b5e4c939f4101e5ede6a14903c3884b9677dd428

Merge pull request #1698 from hzhuang1/rm_emmc_delay

Rm emmc delay

drivers/mmc/mmc.c

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 418ab11..02bf770 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -246,6 +246,13 @@
 			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) |

plat/hisilicon/hikey/hikey_bl2_setup.c

diff --git a/plat/hisilicon/hikey/hikey_bl2_setup.c b/plat/hisilicon/hikey/hikey_bl2_setup.c
index d42afe0..125d665 100644
--- a/plat/hisilicon/hikey/hikey_bl2_setup.c
+++ b/plat/hisilicon/hikey/hikey_bl2_setup.c
@@ -336,7 +336,6 @@
 	params.flags = MMC_FLAG_CMD23;
 	info.mmc_dev_type = MMC_IS_EMMC;
 	dw_mmc_init(&params, &info);
-	mdelay(20);
 
 	hikey_io_setup();
 }