mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
mmc: sdhci-esdhc-imx: remove ESDHC_CD_GPIO handling from IO accessory
With commit 9444e07 (mmc: remove unncessary mmc_gpio_free_cd() call from slot-gpio users) in place, the ESDHC_CD_GPIO handling in IO accessories becomes unnecessary. Remove it. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
parent
8213af3b7a
commit
a043859043
1 changed files with 0 additions and 17 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue