From: Tony Lin <tony.lin@freescale.com>
Date: Thu, 2 Feb 2012 05:59:05 +0000 (+0800)
Subject: ENGR00173615-2 [mx6q mmc]remove software workaround for TO1.1 and later
X-Git-Tag: v3.0.35-fsl_4.1.0~1712
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=378f140d1f1af648cd193f538a3f1c28e1744061;p=karo-tx-linux.git

ENGR00173615-2 [mx6q mmc]remove software workaround for TO1.1 and later

the card interrupt status bit workaround and TC interrupt comes earlier than
DMA interrupt workaround are not necessary for i.MX6Q TO1.1 and later

Signed-off-by: Tony Lin <tony.lin@freescale.com>
---

diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index d5dd1ff34194..496de7862ced 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -102,9 +102,10 @@ static u32 esdhc_readl_le(struct sdhci_host *host, int reg)
 			val |= SDHCI_CARD_PRESENT;
 	}
 
-	if (reg == SDHCI_INT_STATUS && cpu_is_mx6q()) {
+	if (reg == SDHCI_INT_STATUS && cpu_is_mx6q()
+		&& mx6q_revision() == IMX_CHIP_REVISION_1_0) {
 		/*
-		 * on mx6q, there is low possibility that
+		 * on mx6q TO1.0, there is low possibility that
 		 * DATA END interrupt comes ealier than DMA
 		 * END interrupt which is conflict with standard
 		 * host controller spec. In this case, read the
@@ -157,10 +158,11 @@ static void esdhc_writel_le(struct sdhci_host *host, u32 val, int reg)
 			val &= ~(SDHCI_INT_CARD_REMOVE | \
 				SDHCI_INT_CARD_INSERT);
 
-		if (!(val & SDHCI_INT_CARD_INT) && cpu_is_mx6q())
+		if (!(val & SDHCI_INT_CARD_INT) && cpu_is_mx6q()
+			&& mx6q_revision() == IMX_CHIP_REVISION_1_0)
 			/*
 			 * write 1 to clear card interrupt status bit
-			 * (only applied to mx6q)
+			 * (only applied to mx6q TO1.0)
 			 * uSDHC used for mx6q has such problem which is
 			 * not consistant with standard host controller
 			 * definition.