Browse Source

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>
Jaehoon Chung 8 years ago
parent
commit
6f88a3a5d9
3 changed files with 3 additions and 6 deletions
  1. 1 1
      drivers/mmc/pic32_sdhci.c
  2. 2 4
      drivers/mmc/sdhci.c
  3. 0 1
      include/sdhci.h

+ 1 - 1
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;

+ 2 - 4
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,

+ 0 - 1
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)