diff options
| author |   Adrian Hunter <adrian.hunter@intel.com> | 2014-01-13 09:49:16 +0200 |
|---|---|---|
| committer |   Chris Ball <chris@printf.net> | 2014-01-20 10:31:08 -0500 |
| commit | 77a0122e0838663795651aa0beb2325156f98c09 (patch) | |
| tree | aa2aff1bfb5d0788226231f3fde022cec8ede1df /drivers/mmc/host/sdhci-pci.h | |
| parent | mmc: sdhci: Allow for long command timeouts (diff) | |
| download | linux-dev-77a0122e0838663795651aa0beb2325156f98c09.tar.xz linux-dev-77a0122e0838663795651aa0beb2325156f98c09.zip | |
mmc: sdhci-pci: Fix BYT sd card getting stuck in runtime suspend
A host controller for a SD card may need a GPIO for card detect in order
to wake up from runtime suspend when a card is inserted. If that GPIO is
not configured, then the host controller will not wake up. Fix that for
the affected devices by not enabling runtime PM unless the GPIO is
successfully set up.
This affects BYT sd card host controller which had runtime PM enabled from
v3.11. For completeness, the MFD sd card host controller is flagged also.
The original patch before rebasing (see link below) was tested on v3.11.10
and v3.12.4 although the patch applied with some offsets and fuzz. The
original patch is here:
http://marc.info/?l=linux-mmc&m=138676702327057
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: stable <stable@vger.kernel.org> # 3.11+
Signed-off-by: Chris Ball <chris@printf.net>
Diffstat (limited to 'drivers/mmc/host/sdhci-pci.h')
| -rw-r--r-- | drivers/mmc/host/sdhci-pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-pci.h b/drivers/mmc/host/sdhci-pci.h index 0347804eda80..6d718719659e 100644 --- a/drivers/mmc/host/sdhci-pci.h +++ b/drivers/mmc/host/sdhci-pci.h @@ -39,6 +39,7 @@ struct sdhci_pci_fixes { unsigned int quirks; unsigned int quirks2; bool allow_runtime_pm; + bool own_cd_for_runtime_pm; int (*probe) (struct sdhci_pci_chip *); |