diff options
-rw-r--r-- | drivers/mmc/host/sdhci-esdhc-imx.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index dd7fcc137644..ae68bc965ab5 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c | |||
@@ -150,16 +150,6 @@ static u32 esdhc_readl_le(struct sdhci_host *host, int reg) | |||
150 | 150 | ||
151 | u32 val = readl(host->ioaddr + reg); | 151 | u32 val = readl(host->ioaddr + reg); |
152 | 152 | ||
153 | if (unlikely(reg == SDHCI_PRESENT_STATE)) { | ||
154 | /* | ||
155 | * After SDHCI core gets improved to never query | ||
156 | * SDHCI_CARD_PRESENT state in GPIO case, we can | ||
157 | * remove this check. | ||
158 | */ | ||
159 | if (boarddata->cd_type == ESDHC_CD_GPIO) | ||
160 | val &= ~SDHCI_CARD_PRESENT; | ||
161 | } | ||
162 | |||
163 | if (unlikely(reg == SDHCI_CAPABILITIES)) { | 153 | if (unlikely(reg == SDHCI_CAPABILITIES)) { |
164 | /* In FSL esdhc IC module, only bit20 is used to indicate the | 154 | /* In FSL esdhc IC module, only bit20 is used to indicate the |
165 | * ADMA2 capability of esdhc, but this bit is messed up on | 155 | * 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) | |||
192 | u32 data; | 182 | u32 data; |
193 | 183 | ||
194 | if (unlikely(reg == SDHCI_INT_ENABLE || reg == SDHCI_SIGNAL_ENABLE)) { | 184 | if (unlikely(reg == SDHCI_INT_ENABLE || reg == SDHCI_SIGNAL_ENABLE)) { |
195 | if (boarddata->cd_type == ESDHC_CD_GPIO) | ||
196 | /* | ||
197 | * These interrupts won't work with a custom | ||
198 | * card_detect gpio (only applied to mx25/35) | ||
199 | */ | ||
200 | val &= ~(SDHCI_INT_CARD_REMOVE | SDHCI_INT_CARD_INSERT); | ||
201 | |||
202 | if (val & SDHCI_INT_CARD_INT) { | 185 | if (val & SDHCI_INT_CARD_INT) { |
203 | /* | 186 | /* |
204 | * Clear and then set D3CD bit to avoid missing the | 187 | * Clear and then set D3CD bit to avoid missing the |