mmc: sdhci-esdhc-imx: remove ESDHC_CD_GPIO handling from IO accessory
authorShawn Guo <shawn.guo@linaro.org>
Tue, 15 Jan 2013 15:19:54 +0000 (23:19 +0800)
committerChris Ball <cjb@laptop.org>
Mon, 28 Jan 2013 11:51:34 +0000 (06:51 -0500)
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>
drivers/mmc/host/sdhci-esdhc-imx.c

index dd7fcc137644066e93fa5884d4f09539c0a0c0b2..ae68bc965ab54376e9fce84d59ffc231a607b421 100644 (file)
@@ -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