summaryrefslogtreecommitdiff
path: root/drivers/mmc
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2014-01-14 20:36:21 +0400
committerChris Ball <chris@printf.net>2014-02-23 19:40:44 +0400
commit57de31f6351ecad9212a26d2112b546e4c8b4a5b (patch)
tree2909c1f4cc585e2027b46ce3316f7deff67c555c /drivers/mmc
parentb9ec26160f998493509b782be999ff59e4372971 (diff)
downloadlinux-57de31f6351ecad9212a26d2112b546e4c8b4a5b.tar.xz
mmc: core: Use generic CMD6 time while switching to eMMC HS200 mode
Conform to the eMMC spec and use the CMD6 generic timeout from the EXT_CSD register, when switching to HS200 mode. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Chris Ball <chris@printf.net>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/core/mmc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index c944692f3c4e..6b7ccef51beb 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -857,7 +857,9 @@ static int mmc_select_hs200(struct mmc_card *card)
/* switch to HS200 mode if bus width set successfully */
if (!err)
err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
- EXT_CSD_HS_TIMING, 2, 0, true, true, true);
+ EXT_CSD_HS_TIMING, 2,
+ card->ext_csd.generic_cmd6_time,
+ true, true, true);
err:
return err;
}