]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ENGR00217936-02 mmc: esdhc: fix unknown controller version for usdhc
authorRyan QIAN <b32804@freescale.com>
Tue, 24 Jul 2012 04:33:40 +0000 (12:33 +0800)
committerOliver Wendt <ow@karo-electronics.de>
Mon, 30 Sep 2013 12:12:30 +0000 (14:12 +0200)
- Add cpu_is_mx6dq, cpu_is_mx6dl to strengthen the condition.

Note: mx6sl has no such issue because it's fixed by IC, in other word,
mx6sl aligns with sdhc specification.

Signed-off-by: Ryan QIAN <b32804@freescale.com>
drivers/mmc/host/sdhci-esdhc-imx.c

index 11111855bb8bfd1407858ac91914f67aaec04351..3f809a6c87f36687cc07014eaacd9118818b3c44 100644 (file)
@@ -364,8 +364,9 @@ static u16 esdhc_readw_le(struct sdhci_host *host, int reg)
        case SDHCI_HOST_VERSION:
                reg ^= 2;
                val = readl(host->ioaddr + reg);
-               if (((val & SDHCI_SPEC_VER_MASK) >> SDHCI_SPEC_VER_SHIFT)
-                               == SDHCI_FSL_SVN_300) {
+               if ((cpu_is_mx6q() || cpu_is_mx6dl()) &&
+                       ((val & SDHCI_SPEC_VER_MASK) >> SDHCI_SPEC_VER_SHIFT)
+                       == SDHCI_FSL_SVN_300) {
                        val &= ~SDHCI_SPEC_VER_MASK;
                        val |= SDHCI_SPEC_300;
                }