diff options
author | Seungwon Jeon <tgih.jun@samsung.com> | 2014-03-14 08:12:27 -0400 |
---|---|---|
committer | Chris Ball <chris@printf.net> | 2014-04-20 16:59:48 -0400 |
commit | 5438ad95a57cbfd95708a5047a27ff3cce345b79 (patch) | |
tree | 716db308492802ea9df5780b1423aa9bdded00eb | |
parent | 6dad6c9594577969f6d74ca1b344e00314bb3b64 (diff) |
mmc: omap: clarify DDR timing mode between SD-UHS and eMMC
Replaced UHS_DDR50 with MMC_DDR52.
Signed-off-by: Seungwon Jeon <tgih.jun@samsung.com>
Acked-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <chris@printf.net>
-rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index e91ee21549d0..b4de63bf10fd 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c | |||
@@ -582,7 +582,7 @@ static void omap_hsmmc_set_clock(struct omap_hsmmc_host *host) | |||
582 | * - MMC/SD clock coming out of controller > 25MHz | 582 | * - MMC/SD clock coming out of controller > 25MHz |
583 | */ | 583 | */ |
584 | if ((mmc_slot(host).features & HSMMC_HAS_HSPE_SUPPORT) && | 584 | if ((mmc_slot(host).features & HSMMC_HAS_HSPE_SUPPORT) && |
585 | (ios->timing != MMC_TIMING_UHS_DDR50) && | 585 | (ios->timing != MMC_TIMING_MMC_DDR52) && |
586 | ((OMAP_HSMMC_READ(host->base, CAPA) & HSS) == HSS)) { | 586 | ((OMAP_HSMMC_READ(host->base, CAPA) & HSS) == HSS)) { |
587 | regval = OMAP_HSMMC_READ(host->base, HCTL); | 587 | regval = OMAP_HSMMC_READ(host->base, HCTL); |
588 | if (clkdiv && (clk_get_rate(host->fclk)/clkdiv) > 25000000) | 588 | if (clkdiv && (clk_get_rate(host->fclk)/clkdiv) > 25000000) |
@@ -602,7 +602,7 @@ static void omap_hsmmc_set_bus_width(struct omap_hsmmc_host *host) | |||
602 | u32 con; | 602 | u32 con; |
603 | 603 | ||
604 | con = OMAP_HSMMC_READ(host->base, CON); | 604 | con = OMAP_HSMMC_READ(host->base, CON); |
605 | if (ios->timing == MMC_TIMING_UHS_DDR50) | 605 | if (ios->timing == MMC_TIMING_MMC_DDR52) |
606 | con |= DDR; /* configure in DDR mode */ | 606 | con |= DDR; /* configure in DDR mode */ |
607 | else | 607 | else |
608 | con &= ~DDR; | 608 | con &= ~DDR; |