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

Commit 7dd109ef authored by Dong Aisheng's avatar Dong Aisheng Committed by Chris Ball
Browse files

mmc: sdhci-esdhc-imx: add SDHCI_TRANSFER_MODE read function 



Used to read out the correct value of SDHCI_TRANSFER_MODE register
for upper layer.

Signed-off-by: default avatarDong Aisheng <b29396@freescale.com>
Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 2b558c13

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

+16 −0
Original line number Diff line number Diff line
@@ -385,6 +385,22 @@ static u16 esdhc_readw_le(struct sdhci_host *host, int reg) 
		return ret;

	}



	if (unlikely(reg == SDHCI_TRANSFER_MODE)) {

		if (esdhc_is_usdhc(imx_data)) {

			u32 m = readl(host->ioaddr + ESDHC_MIX_CTRL);

			ret = m & ESDHC_MIX_CTRL_SDHCI_MASK;

			/* Swap AC23 bit */

			if (m & ESDHC_MIX_CTRL_AC23EN) {

				ret &= ~ESDHC_MIX_CTRL_AC23EN;

				ret |= SDHCI_TRNS_AUTO_CMD23;

			}

		} else {

			ret = readw(host->ioaddr + SDHCI_TRANSFER_MODE);

		}



		return ret;

	}



	return readw(host->ioaddr + reg);

}