diff options
| author | Andy Shevchenko | 2018-01-11 14:51:58 +0100 |
|---|---|---|
| committer | Ulf Hansson | 2018-01-11 15:51:09 +0100 |
| commit | 2a609abe71ca59e4bd7139e161eaca2144ae6f2e (patch) | |
| tree | 2e245461b39e3d0c42baa004b477ad7be4badcef /drivers/mmc/host/sdhci-pci-core.c | |
| parent | mmc: tmio, renesas_sdhi: Remove unneeded NULL check (diff) | |
| download | kernel-qcow2-linux-2a609abe71ca59e4bd7139e161eaca2144ae6f2e.tar.gz kernel-qcow2-linux-2a609abe71ca59e4bd7139e161eaca2144ae6f2e.tar.xz kernel-qcow2-linux-2a609abe71ca59e4bd7139e161eaca2144ae6f2e.zip | |
sdhci: Advertise 2.0v supply on SDIO host controller
On Intel Edison the Broadcom Wi-Fi card, which is connected to SDIO,
requires 2.0v, while the host, according to Intel Merrifield TRM,
supports 1.8v supply only.
The card announces itself as
mmc2: new ultra high speed DDR50 SDIO card at address 0001
Introduce a custom OCR mask for SDIO host controller on Intel Merrifield
and add a special case to sdhci_set_power_noreg() to override 2.0v supply
by enforcing 1.8v power choice.
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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c index c5b229b46314..00fa7a36b336 100644 --- a/drivers/mmc/host/sdhci-pci-core.c +++ b/drivers/mmc/host/sdhci-pci-core.c @@ -930,6 +930,8 @@ static int intel_mrfld_mmc_probe_slot(struct sdhci_pci_slot *slot) slot->host->quirks2 |= SDHCI_QUIRK2_NO_1_8_V; break; case INTEL_MRFLD_SDIO: + /* Advertise 2.0v for compatibility with the SDIO card's OCR */ + slot->host->ocr_mask = MMC_VDD_20_21 | MMC_VDD_165_195; slot->host->mmc->caps |= MMC_CAP_NONREMOVABLE | MMC_CAP_POWER_OFF_CARD; break; |