mmc: core: enable support for the standard "wakeup-source" property

sudeep-holla · storulf · commit 0dbcdc0622ea · 2015-12-22T11:32:01.000+01:00
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 &lt;adrian.hunter@intel.com&gt;
Signed-off-by: Sudeep Holla &lt;sudeep.holla@arm.com&gt;
Signed-off-by: Ulf Hansson &lt;ulf.hansson@linaro.org&gt;
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
@@ -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;
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,8 @@ void sdhci_get_of_property(struct platform_device *pdev)`
`104`	`104`	`if (of_find_property(np, "keep-power-in-suspend", NULL))`
`105`	`105`	`host->mmc->pm_caps \|= MMC_PM_KEEP_POWER;`
`106`	`106`
`107`		`- if (of_find_property(np, "enable-sdio-wakeup", NULL))`
	`107`	`+ if (of_property_read_bool(np, "wakeup-source") \|\|`
	`108`	`+ of_property_read_bool(np, "enable-sdio-wakeup")) /* legacy */`
`108`	`109`	`host->mmc->pm_caps \|= MMC_PM_WAKE_SDIO_IRQ;`
`109`	`110`	`}`
`110`	`111`	`#else`