diff options
| author | Seungwon Jeon <tgih.jun@samsung.com> | 2012-01-02 08:00:02 +0100 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2012-01-12 21:17:08 +0100 |
| commit | 3f514291df96e0a34bc61c7c456ca1d3fdc1f1bb (patch) | |
| tree | 83a214f47b5de4a155a90ff7ae18e96de988fdb9 /drivers/mmc | |
| parent | mmc: sd: Fix SDR12 timing regression (diff) | |
| download | linux-3f514291df96e0a34bc61c7c456ca1d3fdc1f1bb.tar.xz linux-3f514291df96e0a34bc61c7c456ca1d3fdc1f1bb.zip | |
mmc: dw_mmc: Clear the DDR mode for non-DDR
UHS_REG should be cleared for non-DDR mode. But currently there is
no way to clear DDR mode, if it is already set once. This patch adds
clearing DDR mode for non-DDR mode.
Signed-off-by: Seungwon Jeon <tgih.jun@samsung.com>
Acked-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/dw_mmc.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index c583b943f615..94e223825a45 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -707,12 +707,15 @@ static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) break; } + regs = mci_readl(slot->host, UHS_REG); + /* DDR mode set */ - if (ios->timing == MMC_TIMING_UHS_DDR50) { - regs = mci_readl(slot->host, UHS_REG); + if (ios->timing == MMC_TIMING_UHS_DDR50) regs |= (0x1 << slot->id) << 16; - mci_writel(slot->host, UHS_REG, regs); - } + else + regs &= ~(0x1 << slot->id) << 16; + + mci_writel(slot->host, UHS_REG, regs); if (ios->clock) { /* |