Commit f30dc8f9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc 

Pull MMC fixes from Ulf Hansson:
 "A couple of MMC fixes to the Renesas SDHI driver:

   - Fix HS400 on R-Car M3-W+

   - Abort tuning when timeout detected"

* tag 'mmc-v5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: renesas_sdhi: Fix HS400 on R-Car M3-W+
  mmc: renesas_sdhi: abort tuning when timeout detected
parents 06af8679 6687cd72

drivers/mmc/host/renesas_sdhi_core.c

+7 −2
Original line number Diff line number Diff line
@@ -692,14 +692,19 @@ static int renesas_sdhi_execute_tuning(struct mmc_host *mmc, u32 opcode) 


	/* Issue CMD19 twice for each tap */

	for (i = 0; i < 2 * priv->tap_num; i++) {

		int cmd_error;



		/* Set sampling clock position */

		sd_scc_write32(host, priv, SH_MOBILE_SDHI_SCC_TAPSET, i % priv->tap_num);



		if (mmc_send_tuning(mmc, opcode, NULL) == 0)

		if (mmc_send_tuning(mmc, opcode, &cmd_error) == 0)

			set_bit(i, priv->taps);



		if (sd_scc_read32(host, priv, SH_MOBILE_SDHI_SCC_SMPCMP) == 0)

			set_bit(i, priv->smpcmp);



		if (cmd_error)

			mmc_abort_tuning(mmc, opcode);

	}



	ret = renesas_sdhi_select_tuning(host);
@@ -939,7 +944,7 @@ static const struct soc_device_attribute sdhi_quirks_match[] = { 
	{ .soc_id = "r8a7795", .revision = "ES3.*", .data = &sdhi_quirks_bad_taps2367 },

	{ .soc_id = "r8a7796", .revision = "ES1.[012]", .data = &sdhi_quirks_4tap_nohs400 },

	{ .soc_id = "r8a7796", .revision = "ES1.*", .data = &sdhi_quirks_r8a7796_es13 },

	{ .soc_id = "r8a7796", .revision = "ES3.*", .data = &sdhi_quirks_bad_taps1357 },

	{ .soc_id = "r8a77961", .data = &sdhi_quirks_bad_taps1357 },

	{ .soc_id = "r8a77965", .data = &sdhi_quirks_r8a77965 },

	{ .soc_id = "r8a77980", .data = &sdhi_quirks_nohs400 },

	{ .soc_id = "r8a77990", .data = &sdhi_quirks_r8a77990 },