mmc: sdhci: remove the SDHCI_QUIRK_NO_CD

This quirk doesn't need anymore.
It's replaced to get_cd callback function.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>

diff --git a/drivers/mmc/pic32_sdhci.c b/drivers/mmc/pic32_sdhci.c
index 8d528de8b6629a638c77b3e552bdb5ef51c4fad9..fd2f5e3d5a85ef4ce5d44d0861129c02d8733bb3 100644 (file)
--- a/drivers/mmc/pic32_sdhci.c
+++ b/drivers/mmc/pic32_sdhci.c
@@ -44,7 +44,7 @@ static int pic32_sdhci_probe(struct udevice *dev)
 
        host->ioaddr    = ioremap(addr, size);
        host->name      = dev->name;
-       host->quirks    = SDHCI_QUIRK_NO_HISPD_BIT | SDHCI_QUIRK_NO_CD;
+       host->quirks    = SDHCI_QUIRK_NO_HISPD_BIT;
        host->bus_width = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
                                        "bus-width", 4);
        host->ops = &pic32_sdhci_ops;

diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 230416a9f15aa6a857fbcfc29b7f0bca65dcb1ce..dadee15c8fd8b73febd0f8a8d6d215d91b984952 100644 (file)
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -484,10 +484,8 @@ static int sdhci_init(struct mmc *mmc)
 
        sdhci_set_power(host, fls(mmc->cfg->voltages) - 1);
 
-       if (host->quirks & SDHCI_QUIRK_NO_CD) {
-               if (host->ops->get_cd)
-                       host->ops->get_cd(host);
-       }
+       if (host->ops->get_cd)
+               host->ops->get_cd(host);
 
        /* Enable only interrupts served by the SD controller */
        sdhci_writel(host, SDHCI_INT_DATA_MASK | SDHCI_INT_CMD_MASK,

diff --git a/include/sdhci.h b/include/sdhci.h
index 0c0f48f493dbedf494f577d619d49fae133a4a7d..e4299d1e1bacaba393a9e4a72f898746c5e0a5a5 100644 (file)
--- a/include/sdhci.h
+++ b/include/sdhci.h
@@ -213,7 +213,6 @@
 #define SDHCI_QUIRK_BROKEN_R1B         (1 << 2)
 #define SDHCI_QUIRK_NO_HISPD_BIT       (1 << 3)
 #define SDHCI_QUIRK_BROKEN_VOLTAGE     (1 << 4)
-#define SDHCI_QUIRK_NO_CD              (1 << 5)
 #define SDHCI_QUIRK_WAIT_SEND_CMD      (1 << 6)
 #define SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER (1 << 7)
 #define SDHCI_QUIRK_USE_WIDE8          (1 << 8)