summaryrefslogtreecommitdiff
path: root/drivers/mmc
diff options
context:
space:
mode:
authorMika Westerberg <mika.westerberg@linux.intel.com>2013-11-12 12:01:33 +0200
committerJiri Slaby <jslaby@suse.cz>2015-02-08 17:53:13 +0100
commitbb5f415484d7fbf3a0a5c55134ca0a99892544a3 (patch)
tree04b7d6826ff39bbfc6e940e3efddf1d8f85bae28 /drivers/mmc
parent9606e430dc79200193b15df6997c7981e19216c1 (diff)
downloadlwn-bb5f415484d7fbf3a0a5c55134ca0a99892544a3.tar.gz
lwn-bb5f415484d7fbf3a0a5c55134ca0a99892544a3.zip
mmc: sdhci-acpi: add new ACPI ID
commit 07c001c119c7de92be9c8ad1f1a3e5af459cb3d4 upstream. Newer Intel PCHs with LPSS have the same SDHCI controller than Haswell but ACPI ID is different. Add this ID to the driver list. Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Acked-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Chris Ball <cjb@laptop.org> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sdhci-acpi.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
index cdd4ce0d7c90..d94fa1467c79 100644
--- a/drivers/mmc/host/sdhci-acpi.c
+++ b/drivers/mmc/host/sdhci-acpi.c
@@ -144,6 +144,7 @@ static const struct sdhci_acpi_uid_slot sdhci_acpi_uids[] = {
{ "80860F14" , "3" , &sdhci_acpi_slot_int_sd },
{ "INT33BB" , "2" , &sdhci_acpi_slot_int_sdio },
{ "INT33C6" , NULL, &sdhci_acpi_slot_int_sdio },
+ { "INT3436" , NULL, &sdhci_acpi_slot_int_sdio },
{ "PNP0D40" },
{ },
};
@@ -152,6 +153,7 @@ static const struct acpi_device_id sdhci_acpi_ids[] = {
{ "80860F14" },
{ "INT33BB" },
{ "INT33C6" },
+ { "INT3436" },
{ "PNP0D40" },
{ },
};