Merge "mmc: core: Enable HS mode first in the device and then in the host" (eb9fd932) · Commits · e / devices / android_kernel_sony_msm8998

drivers/mmc/core/mmc.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -1192,10 +1192,6 @@ static int mmc_select_hs400(struct mmc_card *card)
		if (host->caps & MMC_CAP_WAIT_WHILE_BUSY)
		send_status = false;

		/* Reduce frequency to HS frequency */
		max_dtr = card->ext_csd.hs_max_dtr;
		mmc_set_clock(host, max_dtr);

		/* Switch card to HS mode */
		val = EXT_CSD_TIMING_HS;
		err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
		@@ -1211,6 +1207,10 @@ static int mmc_select_hs400(struct mmc_card *card)
		/* Set host controller to HS timing */
		mmc_set_timing(card->host, MMC_TIMING_MMC_HS);

		/* Reduce frequency to HS frequency */
		max_dtr = card->ext_csd.hs_max_dtr;
		mmc_set_clock(host, max_dtr);

		if (!send_status) {
		err = mmc_switch_status(card);
		if (err)