diff options
| author | Andy Shevchenko | 2016-08-29 11:33:40 +0200 |
|---|---|---|
| committer | Ulf Hansson | 2016-09-26 21:31:22 +0200 |
| commit | d55655773ab23d170b4295666f7feff976124ae3 (patch) | |
| tree | e9f633350aa70308f66fc3b9692ea1b74c2beee5 /drivers/mmc/host/sdhci-pci-core.c | |
| parent | sdhci-pci: refactor intel_mrfld_mmc_probe_slot() (diff) | |
| download | kernel-qcow2-linux-d55655773ab23d170b4295666f7feff976124ae3.tar.gz kernel-qcow2-linux-d55655773ab23d170b4295666f7feff976124ae3.tar.xz kernel-qcow2-linux-d55655773ab23d170b4295666f7feff976124ae3.zip | |
sdhci-pci: enable SDIO interface on Intel Merrifield
Intel Merrifield is known to have an SDIO interface and on Intel Edison board a
WiFi card is wired to it.
Enable the interface here to allow WiFi card enumeration.
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/host/sdhci-pci-core.c')
| -rw-r--r-- | drivers/mmc/host/sdhci-pci-core.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c index 40f4fe833aba..d38d701f4f2d 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_SDIO 3 static int intel_mrfld_mmc_probe_slot(struct sdhci_pci_slot *slot) { @@ -431,6 +432,10 @@ 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_SDIO: + slot->host->mmc->caps |= MMC_CAP_NONREMOVABLE | + MMC_CAP_POWER_OFF_CARD; + break; default: /* SD support is not ready yet */ return -ENODEV; |