aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@intel.com>2014-12-01 08:51:18 -0500
committerUlf Hansson <ulf.hansson@linaro.org>2014-12-02 06:25:29 -0500
commit6aab23a8f79667e500883adb3bee76ceec9fceb6 (patch)
tree51e55e47b7bf1e18c77581a022e1fd74f3cb206a
parente1f5633ad4ddcef37a6dc9a5a64159978c0f7a22 (diff)
mmc: sdhci-pci: Add two host capabilities for BYT
BYT host controllers are capable of doing the bus width test and of waiting while busy, so add the capability flags. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r--drivers/mmc/host/sdhci-pci.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index 632e9d966e5b..95f73007fccf 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -269,7 +269,9 @@ static void sdhci_pci_int_hw_reset(struct sdhci_host *host)
269static int byt_emmc_probe_slot(struct sdhci_pci_slot *slot) 269static int byt_emmc_probe_slot(struct sdhci_pci_slot *slot)
270{ 270{
271 slot->host->mmc->caps |= MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE | 271 slot->host->mmc->caps |= MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE |
272 MMC_CAP_HW_RESET | MMC_CAP_1_8V_DDR; 272 MMC_CAP_HW_RESET | MMC_CAP_1_8V_DDR |
273 MMC_CAP_BUS_WIDTH_TEST |
274 MMC_CAP_WAIT_WHILE_BUSY;
273 slot->host->mmc->caps2 |= MMC_CAP2_HC_ERASE_SZ; 275 slot->host->mmc->caps2 |= MMC_CAP2_HC_ERASE_SZ;
274 slot->hw_reset = sdhci_pci_int_hw_reset; 276 slot->hw_reset = sdhci_pci_int_hw_reset;
275 if (slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BSW_EMMC) 277 if (slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BSW_EMMC)
@@ -279,12 +281,16 @@ static int byt_emmc_probe_slot(struct sdhci_pci_slot *slot)
279 281
280static int byt_sdio_probe_slot(struct sdhci_pci_slot *slot) 282static int byt_sdio_probe_slot(struct sdhci_pci_slot *slot)
281{ 283{
282 slot->host->mmc->caps |= MMC_CAP_POWER_OFF_CARD | MMC_CAP_NONREMOVABLE; 284 slot->host->mmc->caps |= MMC_CAP_POWER_OFF_CARD | MMC_CAP_NONREMOVABLE |
285 MMC_CAP_BUS_WIDTH_TEST |
286 MMC_CAP_WAIT_WHILE_BUSY;
283 return 0; 287 return 0;
284} 288}
285 289
286static int byt_sd_probe_slot(struct sdhci_pci_slot *slot) 290static int byt_sd_probe_slot(struct sdhci_pci_slot *slot)
287{ 291{
292 slot->host->mmc->caps |= MMC_CAP_BUS_WIDTH_TEST |
293 MMC_CAP_WAIT_WHILE_BUSY;
288 slot->cd_con_id = NULL; 294 slot->cd_con_id = NULL;
289 slot->cd_idx = 0; 295 slot->cd_idx = 0;
290 slot->cd_override_level = true; 296 slot->cd_override_level = true;