---

yaml --- r: 336293 b: refs/heads/master c: e5d0e9c h: refs/heads/master i: 336291: d24b9a4 v: v3
git-mirror · Dec 6, 2012 · 4c5c2ef · 4c5c2ef
1 parent 913a889
commit 4c5c2ef
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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;
 }