Commit f3c55a7b authored by Adrian Hunter's avatar Adrian Hunter Committed by Chris Ball

mmc: sdhci-pci: add SDHCI_QUIRK2_HOST_OFF_CARD_ON for Medfield SDIO

SDIO is powered separately from the host controller, so the card can
remain on while the host controller is powered off during suspend.
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 6308d290
...@@ -47,6 +47,7 @@ struct sdhci_pci_slot; ...@@ -47,6 +47,7 @@ struct sdhci_pci_slot;
struct sdhci_pci_fixes { struct sdhci_pci_fixes {
unsigned int quirks; unsigned int quirks;
unsigned int quirks2;
bool allow_runtime_pm; bool allow_runtime_pm;
int (*probe) (struct sdhci_pci_chip *); int (*probe) (struct sdhci_pci_chip *);
...@@ -73,6 +74,7 @@ struct sdhci_pci_chip { ...@@ -73,6 +74,7 @@ struct sdhci_pci_chip {
struct pci_dev *pdev; struct pci_dev *pdev;
unsigned int quirks; unsigned int quirks;
unsigned int quirks2;
bool allow_runtime_pm; bool allow_runtime_pm;
const struct sdhci_pci_fixes *fixes; const struct sdhci_pci_fixes *fixes;
...@@ -272,6 +274,7 @@ static const struct sdhci_pci_fixes sdhci_intel_mfd_sd = { ...@@ -272,6 +274,7 @@ static const struct sdhci_pci_fixes sdhci_intel_mfd_sd = {
static const struct sdhci_pci_fixes sdhci_intel_mfd_sdio = { static const struct sdhci_pci_fixes sdhci_intel_mfd_sdio = {
.quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, .quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,
.quirks2 = SDHCI_QUIRK2_HOST_OFF_CARD_ON,
.allow_runtime_pm = true, .allow_runtime_pm = true,
.probe_slot = mfd_sdio_probe_slot, .probe_slot = mfd_sdio_probe_slot,
}; };
...@@ -1207,6 +1210,7 @@ static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot( ...@@ -1207,6 +1210,7 @@ static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot(
host->hw_name = "PCI"; host->hw_name = "PCI";
host->ops = &sdhci_pci_ops; host->ops = &sdhci_pci_ops;
host->quirks = chip->quirks; host->quirks = chip->quirks;
host->quirks2 = chip->quirks2;
host->irq = pdev->irq; host->irq = pdev->irq;
...@@ -1366,6 +1370,7 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev, ...@@ -1366,6 +1370,7 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev,
chip->fixes = (const struct sdhci_pci_fixes *)ent->driver_data; chip->fixes = (const struct sdhci_pci_fixes *)ent->driver_data;
if (chip->fixes) { if (chip->fixes) {
chip->quirks = chip->fixes->quirks; chip->quirks = chip->fixes->quirks;
chip->quirks2 = chip->fixes->quirks2;
chip->allow_runtime_pm = chip->fixes->allow_runtime_pm; chip->allow_runtime_pm = chip->fixes->allow_runtime_pm;
} }
chip->num_slots = slots; chip->num_slots = slots;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment