diff options
author | Seungwon Jeon <tgih.jun@samsung.com> | 2014-03-14 08:12:43 -0400 |
---|---|---|
committer | Chris Ball <chris@printf.net> | 2014-04-20 17:00:01 -0400 |
commit | cab3a8021bf0dc790071514a07b0b6f745b1814a (patch) | |
tree | e9873b9acc7620f497fb9c4484c37a30614360f5 | |
parent | 1a0ae377bf50ed913f2b71b71e3e2cb3fc9eab30 (diff) |
mmc: dw_mmc: clarify DDR timing mode between SD-UHS and eMMC
Replaced UHS_DDR50 with MMC_DDR52. And MMC_CAP_UHS_DDR50
is removed because of non-implementation of UHS signaling.
Signed-off-by: Seungwon Jeon <tgih.jun@samsung.com>
Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <chris@printf.net>
-rw-r--r-- | drivers/mmc/host/dw_mmc-exynos.c | 5 | ||||
-rw-r--r-- | drivers/mmc/host/dw_mmc.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/mmc/host/dw_mmc-exynos.c b/drivers/mmc/host/dw_mmc-exynos.c index 3423c5ed50c7..a67e784b3a95 100644 --- a/drivers/mmc/host/dw_mmc-exynos.c +++ b/drivers/mmc/host/dw_mmc-exynos.c | |||
@@ -187,7 +187,7 @@ static void dw_mci_exynos_set_ios(struct dw_mci *host, struct mmc_ios *ios) | |||
187 | unsigned long actual; | 187 | unsigned long actual; |
188 | u8 div = priv->ciu_div + 1; | 188 | u8 div = priv->ciu_div + 1; |
189 | 189 | ||
190 | if (ios->timing == MMC_TIMING_UHS_DDR50) { | 190 | if (ios->timing == MMC_TIMING_MMC_DDR52) { |
191 | mci_writel(host, CLKSEL, priv->ddr_timing); | 191 | mci_writel(host, CLKSEL, priv->ddr_timing); |
192 | /* Should be double rate for DDR mode */ | 192 | /* Should be double rate for DDR mode */ |
193 | if (ios->bus_width == MMC_BUS_WIDTH_8) | 193 | if (ios->bus_width == MMC_BUS_WIDTH_8) |
@@ -386,8 +386,7 @@ static int dw_mci_exynos_execute_tuning(struct dw_mci_slot *slot, u32 opcode, | |||
386 | 386 | ||
387 | /* Common capabilities of Exynos4/Exynos5 SoC */ | 387 | /* Common capabilities of Exynos4/Exynos5 SoC */ |
388 | static unsigned long exynos_dwmmc_caps[4] = { | 388 | static unsigned long exynos_dwmmc_caps[4] = { |
389 | MMC_CAP_UHS_DDR50 | MMC_CAP_1_8V_DDR | | 389 | MMC_CAP_1_8V_DDR | MMC_CAP_8_BIT_DATA | MMC_CAP_CMD23, |
390 | MMC_CAP_8_BIT_DATA | MMC_CAP_CMD23, | ||
391 | MMC_CAP_CMD23, | 390 | MMC_CAP_CMD23, |
392 | MMC_CAP_CMD23, | 391 | MMC_CAP_CMD23, |
393 | MMC_CAP_CMD23, | 392 | MMC_CAP_CMD23, |
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index cced599d5aeb..637f52a62c56 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c | |||
@@ -962,7 +962,7 @@ static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) | |||
962 | regs = mci_readl(slot->host, UHS_REG); | 962 | regs = mci_readl(slot->host, UHS_REG); |
963 | 963 | ||
964 | /* DDR mode set */ | 964 | /* DDR mode set */ |
965 | if (ios->timing == MMC_TIMING_UHS_DDR50) | 965 | if (ios->timing == MMC_TIMING_MMC_DDR52) |
966 | regs |= ((0x1 << slot->id) << 16); | 966 | regs |= ((0x1 << slot->id) << 16); |
967 | else | 967 | else |
968 | regs &= ~((0x1 << slot->id) << 16); | 968 | regs &= ~((0x1 << slot->id) << 16); |