From: Ryan QIAN <b32804@freescale.com>
Date: Wed, 16 Jan 2013 02:23:28 +0000 (+0800)
Subject: MLK-11685-1 mmc: add delay after CMD6 befoer sending CMD13 for sandisk
X-Git-Tag: C0P2-H0.0--20200415~4194
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=44b5a945523cbb1cbd6686685278cbfe775c6b16;p=linux.git

MLK-11685-1 mmc: add delay after CMD6 befoer sending CMD13 for sandisk

- Some sandisk emmc cards need certain delay befor sending cmd13 after cmd6.
Original CR: ENGR174296 (commit: fd031f9)

Acked-by: Aisheng Dong <b29396@freescale.com>
Signed-off-by: Ryan QIAN <b32804@freescale.com>
(cherry picked from commit f942bf1db36355d46f38792601594949f3f2c71b)
Signed-off-by: Haibo Chen <haibo.chen@freescale.com>

Conflicts:
	drivers/mmc/core/mmc_ops.c
---

diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index ad6e9798e949..fd389cb1efd9 100644
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -522,6 +522,12 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
 	if (!use_busy_signal)
 		goto out;
 
+	/*
+	 * WORKAROUND: for Sandisk eMMC cards, it might need certain delay
+	 * before sending CMD13 after CMD6
+	 */
+	mdelay(1);
+
 	/*
 	 * CRC errors shall only be ignored in cases were CMD13 is used to poll
 	 * to detect busy completion.