diff options
author | Adrian Hunter <adrian.hunter@intel.com> | 2014-12-01 08:51:19 -0500 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2014-12-02 06:25:29 -0500 |
commit | 9d65cb88e5979d43f47c899601353ca61973ba90 (patch) | |
tree | 96673fa588707eb4badbd6a2d8b6a79973337490 /drivers/mmc | |
parent | 6aab23a8f79667e500883adb3bee76ceec9fceb6 (diff) |
mmc: sdhci-acpi: Add two host capabilities for Intel
Intel 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>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/host/sdhci-acpi.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c index de67ae60d1b3..daba49ac1242 100644 --- a/drivers/mmc/host/sdhci-acpi.c +++ b/drivers/mmc/host/sdhci-acpi.c | |||
@@ -203,7 +203,8 @@ static int sdhci_acpi_sd_probe_slot(struct platform_device *pdev, | |||
203 | static const struct sdhci_acpi_slot sdhci_acpi_slot_int_emmc = { | 203 | static const struct sdhci_acpi_slot sdhci_acpi_slot_int_emmc = { |
204 | .chip = &sdhci_acpi_chip_int, | 204 | .chip = &sdhci_acpi_chip_int, |
205 | .caps = MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE | | 205 | .caps = MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE | |
206 | MMC_CAP_HW_RESET | MMC_CAP_1_8V_DDR, | 206 | MMC_CAP_HW_RESET | MMC_CAP_1_8V_DDR | |
207 | MMC_CAP_BUS_WIDTH_TEST | MMC_CAP_WAIT_WHILE_BUSY, | ||
207 | .caps2 = MMC_CAP2_HC_ERASE_SZ, | 208 | .caps2 = MMC_CAP2_HC_ERASE_SZ, |
208 | .flags = SDHCI_ACPI_RUNTIME_PM, | 209 | .flags = SDHCI_ACPI_RUNTIME_PM, |
209 | .quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, | 210 | .quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, |
@@ -215,7 +216,8 @@ static const struct sdhci_acpi_slot sdhci_acpi_slot_int_sdio = { | |||
215 | .quirks = SDHCI_QUIRK_BROKEN_CARD_DETECTION | | 216 | .quirks = SDHCI_QUIRK_BROKEN_CARD_DETECTION | |
216 | SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, | 217 | SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, |
217 | .quirks2 = SDHCI_QUIRK2_HOST_OFF_CARD_ON, | 218 | .quirks2 = SDHCI_QUIRK2_HOST_OFF_CARD_ON, |
218 | .caps = MMC_CAP_NONREMOVABLE | MMC_CAP_POWER_OFF_CARD, | 219 | .caps = MMC_CAP_NONREMOVABLE | MMC_CAP_POWER_OFF_CARD | |
220 | MMC_CAP_BUS_WIDTH_TEST | MMC_CAP_WAIT_WHILE_BUSY, | ||
219 | .flags = SDHCI_ACPI_RUNTIME_PM, | 221 | .flags = SDHCI_ACPI_RUNTIME_PM, |
220 | .pm_caps = MMC_PM_KEEP_POWER, | 222 | .pm_caps = MMC_PM_KEEP_POWER, |
221 | .probe_slot = sdhci_acpi_sdio_probe_slot, | 223 | .probe_slot = sdhci_acpi_sdio_probe_slot, |
@@ -227,6 +229,7 @@ static const struct sdhci_acpi_slot sdhci_acpi_slot_int_sd = { | |||
227 | .quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, | 229 | .quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, |
228 | .quirks2 = SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON | | 230 | .quirks2 = SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON | |
229 | SDHCI_QUIRK2_STOP_WITH_TC, | 231 | SDHCI_QUIRK2_STOP_WITH_TC, |
232 | .caps = MMC_CAP_BUS_WIDTH_TEST | MMC_CAP_WAIT_WHILE_BUSY, | ||
230 | .probe_slot = sdhci_acpi_sd_probe_slot, | 233 | .probe_slot = sdhci_acpi_sd_probe_slot, |
231 | }; | 234 | }; |
232 | 235 | ||