summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2016-08-29 12:33:41 +0300
committerUlf Hansson <ulf.hansson@linaro.org>2016-09-26 21:31:22 +0200
commit4674b6c87019ba8e3e53c91712fff07b93f4efa7 (patch)
tree8369850d2d0ff921da6c46e8133a04f74277870b /drivers/mmc
parentd55655773ab23d170b4295666f7feff976124ae3 (diff)
downloadlinux-0-day-4674b6c87019ba8e3e53c91712fff07b93f4efa7.tar.gz
linux-0-day-4674b6c87019ba8e3e53c91712fff07b93f4efa7.tar.xz
sdhci-pci: enable SD card interface on Merrifield
Intel Merrifield provides an interface to an external SD card. Enable it here. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sdhci-pci-core.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
index d38d701f4f2dc..3833c5fb28da7 100644
--- a/drivers/mmc/host/sdhci-pci-core.c
+++ b/drivers/mmc/host/sdhci-pci-core.c
@@ -419,6 +419,7 @@ static const struct sdhci_pci_fixes sdhci_intel_byt_sd = {
/* Define Host controllers for Intel Merrifield platform */
#define INTEL_MRFLD_EMMC_0 0
#define INTEL_MRFLD_EMMC_1 1
+#define INTEL_MRFLD_SD 2
#define INTEL_MRFLD_SDIO 3
static int intel_mrfld_mmc_probe_slot(struct sdhci_pci_slot *slot)
@@ -432,12 +433,14 @@ static int intel_mrfld_mmc_probe_slot(struct sdhci_pci_slot *slot)
MMC_CAP_8_BIT_DATA |
MMC_CAP_1_8V_DDR;
break;
+ case INTEL_MRFLD_SD:
+ slot->host->quirks2 |= SDHCI_QUIRK2_NO_1_8_V;
+ break;
case INTEL_MRFLD_SDIO:
slot->host->mmc->caps |= MMC_CAP_NONREMOVABLE |
MMC_CAP_POWER_OFF_CARD;
break;
default:
- /* SD support is not ready yet */
return -ENODEV;
}
return 0;