summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-12-10 21:19:24 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-12-10 21:19:24 +0100
commitf316fc56555a5c3bcf6350f3d5ac26dd2c55f4cb (patch)
tree3af782c75ef4bdf6f67d35ebdb68bbc42a7b5dfe
parent1a14f30b36e5d20a2a1be24888c2158541d97bab (diff)
parente5571397175be315bc6177ba39945dab538793b1 (diff)
Merge branch 'acpi-enumeration'
* acpi-enumeration: mmc: sdhci-acpi: enable runtime-pm for device HID INT33C6
-rw-r--r--drivers/mmc/host/sdhci-acpi.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
index 6ac361744d36..12b0a78497f6 100644
--- a/drivers/mmc/host/sdhci-acpi.c
+++ b/drivers/mmc/host/sdhci-acpi.c
@@ -87,7 +87,15 @@ static const struct sdhci_ops sdhci_acpi_ops_dflt = {
.enable_dma = sdhci_acpi_enable_dma,
};
+static const struct sdhci_acpi_slot sdhci_acpi_slot_int_sdio = {
+ .quirks2 = SDHCI_QUIRK2_HOST_OFF_CARD_ON,
+ .caps = MMC_CAP_NONREMOVABLE | MMC_CAP_POWER_OFF_CARD,
+ .flags = SDHCI_ACPI_RUNTIME_PM,
+ .pm_caps = MMC_PM_KEEP_POWER,
+};
+
static const struct acpi_device_id sdhci_acpi_ids[] = {
+ { "INT33C6", (kernel_ulong_t)&sdhci_acpi_slot_int_sdio },
{ "PNP0D40" },
{ },
};