mmc: sdhci-pci: Set MMC_CAP_AGGRESSIVE_PM for BYT-related Intel controllers
authorAzhar Shaikh <azhar.shaikh@intel.com>
Wed, 29 Mar 2017 18:16:33 +0000 (11:16 -0700)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 24 Apr 2017 19:41:58 +0000 (21:41 +0200)
Set MMC_CAP_AGGRESSIVE_PM for BYT-related Intel SD card
controllers.

Signed-off-by: Azhar Shaikh <azhar.shaikh@intel.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/sdhci-pci-core.c

index 6c0440ef54bedffe3010f8aecbbcf4474c2fef5f..833072b8453e1b6a680735c6457f8193a2e65acf 100644 (file)
@@ -630,16 +630,15 @@ static int byt_sdio_probe_slot(struct sdhci_pci_slot *slot)
 static int byt_sd_probe_slot(struct sdhci_pci_slot *slot)
 {
        byt_read_dsm(slot);
-       slot->host->mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
+       slot->host->mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY |
+                                MMC_CAP_AGGRESSIVE_PM;
        slot->cd_idx = 0;
        slot->cd_override_level = true;
        if (slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BXT_SD ||
            slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BXTM_SD ||
            slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_APL_SD ||
-           slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_GLK_SD) {
+           slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_GLK_SD)
                slot->host->mmc_host_ops.get_cd = bxt_get_cd;
-               slot->host->mmc->caps |= MMC_CAP_AGGRESSIVE_PM;
-       }
 
        return 0;
 }