summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hansson2013-06-10 17:03:47 +0200
committerChris Ball2013-06-27 18:39:22 +0200
commit5a36d6bcdf23e408da1d0cbb5d5ad2a26089e9ca (patch)
treef2039fca81c696999deecd2ffbc4e34462d461b3
parentmmc: core: Invent MMC_CAP2_FULL_PWR_CYCLE (diff)
downloadkernel-qcow2-linux-5a36d6bcdf23e408da1d0cbb5d5ad2a26089e9ca.tar.gz
kernel-qcow2-linux-5a36d6bcdf23e408da1d0cbb5d5ad2a26089e9ca.tar.xz
kernel-qcow2-linux-5a36d6bcdf23e408da1d0cbb5d5ad2a26089e9ca.zip
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:
- cap-mmc-highspeed: MMC high-speed timing is supported
- cap-power-off-card: powering off the card is safe
- cap-sdio-irq: enable SDIO IRQ signalling on this interface
+- full-pwr-cycle: full power cycle of the card is supported
*NOTE* on CD and WP polarity. To use common for all SD/MMC host controllers line
polarity 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)
host->caps |= MMC_CAP_POWER_OFF_CARD;
if (of_find_property(np, "cap-sdio-irq", &len))
host->caps |= MMC_CAP_SDIO_IRQ;
+ if (of_find_property(np, "full-pwr-cycle", &len))
+ host->caps2 |= MMC_CAP2_FULL_PWR_CYCLE;
if (of_find_property(np, "keep-power-in-suspend", &len))
host->pm_caps |= MMC_PM_KEEP_POWER;
if (of_find_property(np, "enable-sdio-wakeup", &len))