From 4c5c2ef7930f72e3e927fbfc5a30b8a65651840a Mon Sep 17 00:00:00 2001 From: Abhilash Kesavan Date: Mon, 19 Nov 2012 10:26:19 +0530 Subject: [PATCH] --- yaml --- r: 336293 b: refs/heads/master c: e5d0e9c567389e261fbad6311ea78e6b8d4a24e9 h: refs/heads/master i: 336291: d24b9a49549d3494f514fec37423a4c42da5f385 v: v3 --- [refs] | 2 +- trunk/Documentation/devicetree/bindings/mmc/mmc.txt | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8eda4833459e..5851be159449 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f2f7cce3293dea973b320ab4b95b90b8ea2ec20 +refs/heads/master: e5d0e9c567389e261fbad6311ea78e6b8d4a24e9 diff --git a/trunk/Documentation/devicetree/bindings/mmc/mmc.txt b/trunk/Documentation/devicetree/bindings/mmc/mmc.txt index 8e2e0ba2f486..b96e510979bf 100644 --- a/trunk/Documentation/devicetree/bindings/mmc/mmc.txt +++ b/trunk/Documentation/devicetree/bindings/mmc/mmc.txt @@ -22,6 +22,10 @@ Optional properties: - wp-inverted: when present, polarity on the wp gpio line is inverted - max-frequency: maximum operating clock frequency +Optional SDIO properties: +- keep-power-in-suspend: Preserves card power during a suspend/resume cycle +- enable-sdio-wakeup: Enables wake up of host system on SDIO IRQ assertion + Example: sdhci@ab000000 { @@ -33,4 +37,6 @@ sdhci@ab000000 { cd-inverted; wp-gpios = <&gpio 70 0>; max-frequency = <50000000>; + keep-power-in-suspend; + enable-sdio-wakeup; }