Merge "mmc: core: Select HS mode in device first and then in the host" (559371f0) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/mmc/core/mmc.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -1357,10 +1357,6 @@ int mmc_hs400_to_hs200(struct mmc_card *card)
		int err;
		u8 val;

		/* 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,
		@@ -1371,6 +1367,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);

		err = mmc_switch_status(card, false);
		if (err)
		goto out_err;

+8 −1

Original line number	Diff line number	Diff line
		@@ -3102,8 +3102,15 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)
		return;
		}
		if (host->quirks2 &
		SDHCI_QUIRK2_IGNORE_DATATOUT_FOR_R1BCMD)
		SDHCI_QUIRK2_IGNORE_DATATOUT_FOR_R1BCMD) {
		pr_err_ratelimited("%s: %s: ignoring interrupt: 0x%08x due to DATATOUT_FOR_R1B quirk\n",
		mmc_hostname(host->mmc),
		__func__, intmask);
		MMC_TRACE(host->mmc,
		"%s: Quirk ignoring intr: 0x%08x\n",
		__func__, intmask);
		return;
		}
		if (intmask & SDHCI_INT_DATA_TIMEOUT) {
		host->data_cmd = NULL;
		data_cmd->error = -ETIMEDOUT;