Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d5112b6 authored by Ulf Hansson's avatar Ulf Hansson Committed by Greg Kroah-Hartman
Browse files

mmc: omap_hsmmc: Fix UHS card with DDR50 support 



commit 903101a83949d6fc77c092cef07e9c1e10c07e46 upstream.

The commit, mmc: omap: clarify DDR timing mode between SD-UHS and eMMC,
switched omap_hsmmc to support MMC DDR mode instead of UHS DDR50 mode.

Add UHS DDR50 mode again and this time let's also keep the MMC DDR mode.

Fixes: 5438ad95 (mmc: omap: clarify DDR timing mode between SD-UHS and eMMC)
Reported-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 31b54953

drivers/mmc/host/omap_hsmmc.c

+3 −1
Original line number Diff line number Diff line
@@ -609,6 +609,7 @@ static void omap_hsmmc_set_clock(struct omap_hsmmc_host *host) 
	 */

	if ((mmc_slot(host).features & HSMMC_HAS_HSPE_SUPPORT) &&

	    (ios->timing != MMC_TIMING_MMC_DDR52) &&

	    (ios->timing != MMC_TIMING_UHS_DDR50) &&

	    ((OMAP_HSMMC_READ(host->base, CAPA) & HSS) == HSS)) {

		regval = OMAP_HSMMC_READ(host->base, HCTL);

		if (clkdiv && (clk_get_rate(host->fclk)/clkdiv) > 25000000)
@@ -628,7 +629,8 @@ static void omap_hsmmc_set_bus_width(struct omap_hsmmc_host *host) 
	u32 con;



	con = OMAP_HSMMC_READ(host->base, CON);

	if (ios->timing == MMC_TIMING_MMC_DDR52)

	if (ios->timing == MMC_TIMING_MMC_DDR52 ||

	    ios->timing == MMC_TIMING_UHS_DDR50)

		con |= DDR;	/* configure in DDR mode */

	else

		con &= ~DDR;