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

drivers/mmc/core/mmc.c

+4 −4

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

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

		/* Switch HS400 to HS DDR */
		val = EXT_CSD_TIMING_HS;
		err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_HS_TIMING,
		@@ -1337,6 +1333,10 @@ int mmc_hs400_to_hs200(struct mmc_card *card)

		mmc_set_timing(host, MMC_TIMING_MMC_DDR52);

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

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