Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b6b0ad6 authored by Sascha Hauer's avatar Sascha Hauer Committed by Chris Ball
Browse files

mmc: sdhci-esdhc-imx: fix for mmc cards on i.MX5 



On i.MX53 we have to write a special SDHCI_CMD_ABORTCMD to the
SDHCI_TRANSFER_MODE register during a MMC_STOP_TRANSMISSION
command. This works for SD cards. However, with MMC cards
the MMC_SET_BLOCK_COUNT command is used instead, but this
needs the same handling. Fix MMC cards by testing for the
MMC_SET_BLOCK_COUNT command aswell. Tested on a custom i.MX53
board with a Transcend MMC+ card and eMMC.

The kernel started used MMC_SET_BLOCK_COUNT in 3.0, so this
is a regression for these boards introduced in 3.0; it should
go to 3.0/3.1/3.2-stable.

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent c84f15ae

drivers/mmc/host/sdhci-esdhc-imx.c

+3 −2
Original line number Diff line number Diff line
@@ -269,8 +269,9 @@ static void esdhc_writew_le(struct sdhci_host *host, u16 val, int reg) 
		imx_data->scratchpad = val;

		return;

	case SDHCI_COMMAND:

		if ((host->cmd->opcode == MMC_STOP_TRANSMISSION)

			&& (imx_data->flags & ESDHC_FLAG_MULTIBLK_NO_INT))

		if ((host->cmd->opcode == MMC_STOP_TRANSMISSION ||

		     host->cmd->opcode == MMC_SET_BLOCK_COUNT) &&

	            (imx_data->flags & ESDHC_FLAG_MULTIBLK_NO_INT))

			val |= SDHCI_CMD_ABORTCMD;



		if (is_imx6q_usdhc(imx_data)) {