summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Zhu <r65037@freescale.com>2011-03-10 14:31:51 +0800
committerAndy Voltz <andy.voltz@timesys.com>2011-06-01 13:21:01 -0400
commitaddaba09ab85ce0f5f84cd89ed195be87aecc954 (patch)
tree2e582be4354881d9c43797a8b07153cbf0c7f78d
parent99f4f0102c0a16bc04a088086363229a6d109618 (diff)
ENGR00140462 esdhci fix the errors after implement the new SOC rev APIs
Fix the errors after implement the new soc rev APIs Refine the SOC revision APIs in the esdhc driver. Signed-off-by: Richard Zhu <r65037@freescale.com>
-rw-r--r--drivers/mmc/host/mx_sdhci.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/host/mx_sdhci.c b/drivers/mmc/host/mx_sdhci.c
index 92e59e49562b..438edcffcfc6 100644
--- a/drivers/mmc/host/mx_sdhci.c
+++ b/drivers/mmc/host/mx_sdhci.c
@@ -243,7 +243,7 @@ static void sdhci_init(struct sdhci_host *host)
SDHCI_INT_DMA_END | SDHCI_INT_DATA_END | SDHCI_INT_RESPONSE;
if ((mx50_revision() == IMX_CHIP_REVISION_1_0)
- || (mx53_revision() < IMX_CHIP_REVISION_2_0))
+ || (mx53_revision() == IMX_CHIP_REVISION_1_0))
intmask |= SDHCI_INT_ACMD12ERR;
if (host->flags & SDHCI_USE_DMA)
@@ -663,8 +663,8 @@ static void sdhci_finish_data(struct sdhci_host *host)
}
data->bytes_xfered = data->blksz * data->blocks;
- if ((data->stop) && ((mx50_revision() >= IMX_CHIP_REVISION_1_1)
- || (mx53_revision() >= IMX_CHIP_REVISION_2_0))) {
+ if ((data->stop) && !((mx50_revision() == IMX_CHIP_REVISION_1_0) ||
+ (mx53_revision() == IMX_CHIP_REVISION_1_0))) {
/*
* The controller needs a reset of internal state machines
* upon error conditions.