summaryrefslogtreecommitdiffstats
path: root/sys/dev/sdhci/sdhci.c
diff options
context:
space:
mode:
authorian <ian@FreeBSD.org>2014-05-27 15:30:24 +0000
committerian <ian@FreeBSD.org>2014-05-27 15:30:24 +0000
commitffc031ceb613b18d970372b61578f988d77e3233 (patch)
tree97cc5af267bb15463dd3cdafdb76a098b3ba0b62 /sys/dev/sdhci/sdhci.c
parentd22760cc9071ae70622e2c29141ee76e73170a16 (diff)
downloadFreeBSD-src-ffc031ceb613b18d970372b61578f988d77e3233.zip
FreeBSD-src-ffc031ceb613b18d970372b61578f988d77e3233.tar.gz
MFC r264096, r264097, r264099 r264100, r264101, r264102, r264119:
Fixes to the ti_sdhci and sdhci drivers (fix clock divisor calcs). Use the ti_sdhci driver instead of ti_mmchs for Pandaboard.
Diffstat (limited to 'sys/dev/sdhci/sdhci.c')
-rw-r--r--sys/dev/sdhci/sdhci.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/sdhci/sdhci.c b/sys/dev/sdhci/sdhci.c
index 92a9b4f..b8e03be 100644
--- a/sys/dev/sdhci/sdhci.c
+++ b/sys/dev/sdhci/sdhci.c
@@ -235,7 +235,8 @@ sdhci_set_clock(struct sdhci_slot *slot, uint32_t clock)
slot->clock = clock;
/* Turn off the clock. */
- WR2(slot, SDHCI_CLOCK_CONTROL, 0);
+ clk = RD2(slot, SDHCI_CLOCK_CONTROL);
+ WR2(slot, SDHCI_CLOCK_CONTROL, clk & ~SDHCI_CLOCK_CARD_EN);
/* If no clock requested - left it so. */
if (clock == 0)
return;
OpenPOWER on IntegriCloud