aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@stericsson.com>2011-03-02 09:53:36 +0100
committerHenrik hman <henrik.ohman@stericsson.com>2011-03-15 14:22:25 +0100
commit39afa214bb13b9ca41149de88bbaf9a21eba960e (patch)
tree1662c2019df8ce61789e095a16346f8afdc88518
parent00d6c47b3b73308ceb802eda469836a423bc4d06 (diff)
downloadlinux-2.6.35-ux500-39afa214bb13b9ca41149de88bbaf9a21eba960e.tar.gz
MMCI: Use CLK_BYPASS together with NEG_EDGE
To make use of CLK_BYPASS bit in the MMCICLOCK register the NEG_EDGE bit must be set as well to get a correct clock signal. ST-Ericsson ID: 325385 Change-Id: I86c9ec67b49c24621372984e0eca5963c339a6b0 Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com> Signed-off-by: Stefan Nilsson XK <stefan.xk.nilsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/17398 Reviewed-by: Sebastian RASMUSSEN <sebastian.rasmussen@stericsson.com> Tested-by: Sebastian RASMUSSEN <sebastian.rasmussen@stericsson.com>
-rw-r--r--drivers/mmc/host/mmci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 09ebfbc..68f15d8 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -146,7 +146,7 @@ static void mmci_set_clkreg(struct mmci_host *host, unsigned int desired)
if (desired) {
if (desired >= host->mclk) {
- clk = MCI_CLK_BYPASS;
+ clk = MCI_CLK_BYPASS | MCI_NEG_EDGE;
host->cclk = host->mclk;
} else if (variant->st_clkdiv) {
clk = ((host->mclk + desired - 1) / desired) - 2;