aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2013-06-10 11:03:47 -0400
committerChris Ball <cjb@laptop.org>2013-06-27 12:39:22 -0400
commit5a36d6bcdf23e408da1d0cbb5d5ad2a26089e9ca (patch)
treef2039fca81c696999deecd2ffbc4e34462d461b3
parent53275c2136cc76b6ff26f8bec268c4bef9bab837 (diff)
mmc: core: Add DT-bindings for MMC_CAP2_FULL_PWR_CYCLE
The DT-binding for MMC_CAP2_FULL_PWR_CYCLE, is used to indicate whether it is possible to perform a full power cycle of the card. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Chris Ball <cjb@laptop.org>
-rw-r--r--Documentation/devicetree/bindings/mmc/mmc.txt1
-rw-r--r--drivers/mmc/core/host.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
index 85aada2263d5..458b57f199af 100644
--- a/Documentation/devicetree/bindings/mmc/mmc.txt
+++ b/Documentation/devicetree/bindings/mmc/mmc.txt
@@ -28,6 +28,7 @@ Optional properties:
28- cap-mmc-highspeed: MMC high-speed timing is supported 28- cap-mmc-highspeed: MMC high-speed timing is supported
29- cap-power-off-card: powering off the card is safe 29- cap-power-off-card: powering off the card is safe
30- cap-sdio-irq: enable SDIO IRQ signalling on this interface 30- cap-sdio-irq: enable SDIO IRQ signalling on this interface
31- full-pwr-cycle: full power cycle of the card is supported
31 32
32*NOTE* on CD and WP polarity. To use common for all SD/MMC host controllers line 33*NOTE* on CD and WP polarity. To use common for all SD/MMC host controllers line
33polarity properties, we have to fix the meaning of the "normal" and "inverted" 34polarity properties, we have to fix the meaning of the "normal" and "inverted"
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 89f58498409a..6fb6f77450cb 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -423,6 +423,8 @@ int mmc_of_parse(struct mmc_host *host)
423 host->caps |= MMC_CAP_POWER_OFF_CARD; 423 host->caps |= MMC_CAP_POWER_OFF_CARD;
424 if (of_find_property(np, "cap-sdio-irq", &len)) 424 if (of_find_property(np, "cap-sdio-irq", &len))
425 host->caps |= MMC_CAP_SDIO_IRQ; 425 host->caps |= MMC_CAP_SDIO_IRQ;
426 if (of_find_property(np, "full-pwr-cycle", &len))
427 host->caps2 |= MMC_CAP2_FULL_PWR_CYCLE;
426 if (of_find_property(np, "keep-power-in-suspend", &len)) 428 if (of_find_property(np, "keep-power-in-suspend", &len))
427 host->pm_caps |= MMC_PM_KEEP_POWER; 429 host->pm_caps |= MMC_PM_KEEP_POWER;
428 if (of_find_property(np, "enable-sdio-wakeup", &len)) 430 if (of_find_property(np, "enable-sdio-wakeup", &len))