---

yaml
---
r: 359895
b: refs/heads/master
c: 290d934
h: refs/heads/master
i:
  359893: 64d2901
  359891: 36dc9ad
  359887: 3e465e1
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22c07f36269befbf092d833d2c7cf0e27a3e9d1f
+refs/heads/master: 290d934172fd751c26f357a93836d54273f835b1

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

@@ -150,16 +150,6 @@ static u32 esdhc_readl_le(struct sdhci_host *host, int reg)
 
 	u32 val = readl(host->ioaddr + reg);
 
-	if (unlikely(reg == SDHCI_PRESENT_STATE)) {
-		/*
-		 * After SDHCI core gets improved to never query
-		 * SDHCI_CARD_PRESENT state in GPIO case, we can
-		 * remove this check.
-		 */
-		if (boarddata->cd_type == ESDHC_CD_GPIO)
-			val &= ~SDHCI_CARD_PRESENT;
-	}
-
 	if (unlikely(reg == SDHCI_CAPABILITIES)) {
 		/* In FSL esdhc IC module, only bit20 is used to indicate the
 		 * ADMA2 capability of esdhc, but this bit is messed up on
@@ -192,13 +182,6 @@ static void esdhc_writel_le(struct sdhci_host *host, u32 val, int reg)
 	u32 data;
 
 	if (unlikely(reg == SDHCI_INT_ENABLE || reg == SDHCI_SIGNAL_ENABLE)) {
-		if (boarddata->cd_type == ESDHC_CD_GPIO)
-			/*
-			 * These interrupts won't work with a custom
-			 * card_detect gpio (only applied to mx25/35)
-			 */
-			val &= ~(SDHCI_INT_CARD_REMOVE | SDHCI_INT_CARD_INSERT);
-
 		if (val & SDHCI_INT_CARD_INT) {
 			/*
 			 * Clear and then set D3CD bit to avoid missing the