Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0dbcdc06 authored by Sudeep Holla's avatar Sudeep Holla Committed by Ulf Hansson
Browse files

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: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 4ef76753

drivers/mmc/core/host.c

+2 −1
Original line number Diff line number Diff line
@@ -275,7 +275,8 @@ int mmc_of_parse(struct mmc_host *host) 
		host->caps2 |= MMC_CAP2_FULL_PWR_CYCLE;

	if (of_property_read_bool(np, "keep-power-in-suspend"))

		host->pm_caps |= MMC_PM_KEEP_POWER;

	if (of_property_read_bool(np, "enable-sdio-wakeup"))

	if (of_property_read_bool(np, "wakeup-source") ||

	    of_property_read_bool(np, "enable-sdio-wakeup")) /* legacy */

		host->pm_caps |= MMC_PM_WAKE_SDIO_IRQ;

	if (of_property_read_bool(np, "mmc-ddr-1_8v"))

		host->caps |= MMC_CAP_1_8V_DDR;

drivers/mmc/host/sdhci-pltfm.c

+2 −1
Original line number Diff line number Diff line
@@ -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