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

drivers/mmc/core/mmc.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1160,9 +1160,6 @@ static int mmc_select_hs400(struct mmc_card *card)
		* Before switching to dual data rate operation for HS400,
		* it is required to convert from HS200 mode to HS mode.
		*/
		mmc_set_timing(card->host, MMC_TIMING_MMC_HS);
		mmc_set_bus_speed(card);

		err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
		EXT_CSD_HS_TIMING, EXT_CSD_TIMING_HS,
		card->ext_csd.generic_cmd6_time,
		@@ -1173,6 +1170,9 @@ static int mmc_select_hs400(struct mmc_card *card)
		return err;
		}

		mmc_set_timing(card->host, MMC_TIMING_MMC_HS);
		mmc_set_bus_speed(card);

		val = EXT_CSD_DDR_BUS_WIDTH_8;
		if (card->ext_csd.strobe_support) {
		err = mmc_select_bus_width(card);