2 files changed, 17 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
index 654b705fc5b7..85aada2263d5 100644
--- a/Documentation/devicetree/bindings/mmc/mmc.txt
+++ b/Documentation/devicetree/bindings/mmc/mmc.txt
@@ -24,6 +24,10 @@ Optional properties:
 - max-frequency: maximum operating clock frequency
 - no-1-8-v: when present, denotes that 1.8v card voltage is not supported on
   this system, even if the controller claims it is.
+- cap-sd-highspeed: SD high-speed timing is supported
+- 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
 
 *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 9c53452e73e1..821cd8224137 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -400,6 +400,19 @@ void mmc_of_parse(struct mmc_host *host)
         }
         if (explicit_inv_wp ^ gpio_inv_wp)
                 host->caps2 |= MMC_CAP2_RO_ACTIVE_HIGH;
+
+        if (of_find_property(np, "cap-sd-highspeed", &len))
+                host->caps |= MMC_CAP_SD_HIGHSPEED;
+        if (of_find_property(np, "cap-mmc-highspeed", &len))
+                host->caps |= MMC_CAP_MMC_HIGHSPEED;
+        if (of_find_property(np, "cap-power-off-card", &len))
+                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, "keep-power-in-suspend", &len))
+                host->pm_caps |= MMC_PM_KEEP_POWER;
+        if (of_find_property(np, "enable-sdio-wakeup", &len))
+                host->pm_caps |= MMC_PM_WAKE_SDIO_IRQ;
 }
 
 EXPORT_SYMBOL(mmc_of_parse);