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

[~andy/linux] / drivers / mmc / host / sdhci-esdhc-imx.c

diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index 461a4c3f4ef725924319058e531aaa457bffd7d5..2be77e0dcc4ea35fd64886aecbf1d01ed9b55017 100644 (file)
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -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);
 }