From 4b2a28a2fd83984114e6c374f782021c19c305ca Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@linaro.org>
Date: Fri, 1 Apr 2011 07:59:17 +0100
Subject: [PATCH] --- yaml --- r: 249962 b: refs/heads/master c:
 399bc4863e2a3b4b255ca22189820c81ca34f4e0 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/mmc/host/mmci.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3103477e9f44..9cadea09b5fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49ac215e071234b2bf2cff7b8bf4f4f3d0e8cd6e
+refs/heads/master: 399bc4863e2a3b4b255ca22189820c81ca34f4e0
diff --git a/trunk/drivers/mmc/host/mmci.c b/trunk/drivers/mmc/host/mmci.c
index 92061f8df31e..4941e06fe2e1 100644
--- a/trunk/drivers/mmc/host/mmci.c
+++ b/trunk/drivers/mmc/host/mmci.c
@@ -103,6 +103,8 @@ static void mmci_set_clkreg(struct mmci_host *host, unsigned int desired)
 	if (desired) {
 		if (desired >= host->mclk) {
 			clk = MCI_CLK_BYPASS;
+			if (variant->st_clkdiv)
+				clk |= MCI_ST_UX500_NEG_EDGE;
 			host->cclk = host->mclk;
 		} else if (variant->st_clkdiv) {
 			/*