From ff2991c0986c49f4c8291df798ebc500a7b4b601 Mon Sep 17 00:00:00 2001
From: Roy Zang <tie-fei.zang@freescale.com>
Date: Tue, 10 Aug 2010 18:02:00 -0700
Subject: [PATCH] --- yaml --- r: 208446 b: refs/heads/master c:
 05e57eec23eadf6641911ff07560f9ec7c6457c1 h: refs/heads/master v: v3

---
 [refs]                                                 | 2 +-
 trunk/Documentation/powerpc/dts-bindings/fsl/esdhc.txt | 2 ++
 trunk/arch/powerpc/boot/dts/p4080ds.dts                | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 61fe901b23bf..5af220489184 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4512f79dcb236c8dc2afae176a0dc520096f0bc
+refs/heads/master: 05e57eec23eadf6641911ff07560f9ec7c6457c1
diff --git a/trunk/Documentation/powerpc/dts-bindings/fsl/esdhc.txt b/trunk/Documentation/powerpc/dts-bindings/fsl/esdhc.txt
index 8a0040738969..64bcb8be973c 100644
--- a/trunk/Documentation/powerpc/dts-bindings/fsl/esdhc.txt
+++ b/trunk/Documentation/powerpc/dts-bindings/fsl/esdhc.txt
@@ -14,6 +14,8 @@ Required properties:
     reports inverted write-protect state;
   - sdhci,1-bit-only : (optional) specifies that a controller can
     only handle 1-bit data transfers.
+  - sdhci,auto-cmd12: (optional) specifies that a controller can
+    only handle auto CMD12.
 
 Example:
 
diff --git a/trunk/arch/powerpc/boot/dts/p4080ds.dts b/trunk/arch/powerpc/boot/dts/p4080ds.dts
index 6b29eab05362..efa00911f12b 100644
--- a/trunk/arch/powerpc/boot/dts/p4080ds.dts
+++ b/trunk/arch/powerpc/boot/dts/p4080ds.dts
@@ -280,6 +280,7 @@
 			reg = <0x114000 0x1000>;
 			interrupts = <48 2>;
 			interrupt-parent = <&mpic>;
+			sdhci,auto-cmd12;
 		};
 
 		i2c@118000 {