diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 963c00f..85762b8 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -1924,8 +1924,7 @@ static int mmc_select_hs400(struct mmc *mmc)
 	}
 
 	/* Set back to HS */
-	mmc_set_card_speed(mmc, MMC_HS, false);
-	mmc_set_clock(mmc, mmc_mode2freq(mmc, MMC_HS), false);
+	mmc_set_card_speed(mmc, MMC_HS, true);
 
 	err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_BUS_WIDTH,
 			 EXT_CSD_BUS_WIDTH_8 | EXT_CSD_DDR_FLAG);
@@ -1962,14 +1961,10 @@ static int mmc_select_hs400es(struct mmc *mmc)
 {
 	int err;
 
-	err = mmc_set_card_speed(mmc, MMC_HS, false);
+	err = mmc_set_card_speed(mmc, MMC_HS, true);
 	if (err)
 		return err;
 
-	/* configure the bus mode (host) */
-	mmc_select_mode(mmc, MMC_HS);
-	mmc_set_clock(mmc, mmc->tran_speed, false);
-
 	err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL,
 		EXT_CSD_BUS_WIDTH, EXT_CSD_BUS_WIDTH_8 |
 		EXT_CSD_DDR_FLAG | EXT_CSD_BUS_WIDTH_STROBE);