Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge tag 'mmc-5-20' of https://github.com/MrVan/u-boot

Browse source 
"Please pull mmc-5-20 for v2019.07, this is to avoid break i.MX53 boot."
This commit is contained in:
Tom Rini 2019-05-21 07:12:51 -04:00
commit ffbad25b32
1 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/mmc/fsl_esdhc.c
View file

@ -621,31 +621,18 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock)
#else #else
int pre_div = 2; int pre_div = 2;
#endif #endif
int ddr_pre_div = mmc->ddr_mode ? 2 : 1;
int sdhc_clk = priv->sdhc_clk; int sdhc_clk = priv->sdhc_clk;
uint clk; uint clk;
/*
* For ddr mode, usdhc need to enable DDR mode first, after select
* this DDR mode, usdhc will automatically divide the usdhc clock
*/
if (mmc->ddr_mode) {
writel(readl(&regs->mixctrl) | MIX_CTRL_DDREN, &regs->mixctrl);
sdhc_clk >>= 1;
}
if (clock < mmc->cfg->f_min) if (clock < mmc->cfg->f_min)
clock = mmc->cfg->f_min; clock = mmc->cfg->f_min;
if (sdhc_clk / 16 > clock) { while (sdhc_clk / (16 * pre_div * ddr_pre_div) > clock && pre_div < 256)
for (; pre_div < 256; pre_div *= 2) pre_div *= 2;
if ((sdhc_clk / pre_div) <= (clock * 16))
break;
} else
pre_div = 1;
for (div = 1; div <= 16; div++) while (sdhc_clk / (div * pre_div * ddr_pre_div) > clock && div < 16)
if ((sdhc_clk / (div * pre_div)) <= clock) div++;
break;
pre_div >>= 1; pre_div >>= 1;
div -= 1; div -= 1;