Merge "mmc: host: Update HS400 timing mode before performing tuning"

		return_to_hs400 = true;

	}

	/*

	 * Timing should be adjusted to the HS400 target

	 * operation frequency for tuning process.

	 * Similar handling is also done in mmc_hs200_tuning()

	 * This is handled properly in sdhci-msm.c from msm-5.4 onwards.

	 */

	if (host->card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS400 &&

		host->ios.bus_width == MMC_BUS_WIDTH_8)

		mmc_set_timing(host, MMC_TIMING_MMC_HS400);

	err = mmc_execute_tuning(host->card);

	if (err)

		goto out;