diff options
| author |   Sudeep Holla <Sudeep.Holla@arm.com> | 2015-10-21 11:10:02 +0100 |
|---|---|---|
| committer |   Ulf Hansson <ulf.hansson@linaro.org> | 2015-12-22 11:32:01 +0100 |
| commit | 0dbcdc0622ea77fae87732c485ca13a1f9375571 (patch) | |
| tree | d84d7714fb8756dcb0452efd7371c749ad8b9883 /drivers/mmc/host/sdhci-pltfm.c | |
| parent | Linux 4.4-rc6 (diff) | |
| download | wireguard-linux-0dbcdc0622ea77fae87732c485ca13a1f9375571.tar.xz wireguard-linux-0dbcdc0622ea77fae87732c485ca13a1f9375571.zip | |
mmc: core: enable support for the standard "wakeup-source" property
Though the mmc core driver should/will continue to support the legacy
"enable-sdio-wakeup" property to enable SDIO as the wakeup source, we
need to add support for the new standard property "wakeup-source".
This patch adds support for "wakeup-source" property in addition to the
existing "enable-sdio-wakeup" property.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host/sdhci-pltfm.c')
| -rw-r--r-- | drivers/mmc/host/sdhci-pltfm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c index 87fb5ea8ebe7..072bb27a65cf 100644 --- a/drivers/mmc/host/sdhci-pltfm.c +++ b/drivers/mmc/host/sdhci-pltfm.c @@ -104,7 +104,8 @@ void sdhci_get_of_property(struct platform_device *pdev) if (of_find_property(np, "keep-power-in-suspend", NULL)) host->mmc->pm_caps |= MMC_PM_KEEP_POWER; - if (of_find_property(np, "enable-sdio-wakeup", NULL)) + if (of_property_read_bool(np, "wakeup-source") || + of_property_read_bool(np, "enable-sdio-wakeup")) /* legacy */ host->mmc->pm_caps |= MMC_PM_WAKE_SDIO_IRQ; } #else |