summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaehoon Chung <jh80.chung@samsung.com>2016-12-30 15:30:15 +0900
committerJaehoon Chung <jh80.chung@samsung.com>2017-01-11 19:40:12 +0900
commit6f88a3a5d9488bc0aed5a62ca5f2a3cda4deded9 (patch)
treeb81cbceecd44912464bfba30c9fff6106a067d16
parent5e96217f04342bfeca7a089eb1cfa726f719a8a0 (diff)
downloadu-boot-imx-6f88a3a5d9488bc0aed5a62ca5f2a3cda4deded9.zip
u-boot-imx-6f88a3a5d9488bc0aed5a62ca5f2a3cda4deded9.tar.gz
u-boot-imx-6f88a3a5d9488bc0aed5a62ca5f2a3cda4deded9.tar.bz2
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>
-rw-r--r--drivers/mmc/pic32_sdhci.c2
-rw-r--r--drivers/mmc/sdhci.c6
-rw-r--r--include/sdhci.h1
3 files changed, 3 insertions, 6 deletions
diff --git a/drivers/mmc/pic32_sdhci.c b/drivers/mmc/pic32_sdhci.c
index 8d528de..fd2f5e3 100644
--- 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 230416a..dadee15 100644
--- 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 0c0f48f..e4299d1 100644
--- 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)