diff options
| author | Tom Rini <trini@ti.com> | 2014-11-26 11:22:29 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-26 11:22:29 -0500 |
| commit | 21008ad6384170767041f1608975473c5ffa7fc7 (patch) | |
| tree | eb00c0fb9650e14ba768d720c057373d9ea59451 /drivers/mmc/fsl_esdhc.c | |
| parent | d3e488eaf48c49980adb8509a76f8577b1cf2599 (diff) | |
| parent | 3b4b9a3377d6e7cba6060497b02644f9ff2ac67a (diff) | |
| download | u-boot-21008ad6384170767041f1608975473c5ffa7fc7.zip u-boot-21008ad6384170767041f1608975473c5ffa7fc7.tar.gz u-boot-21008ad6384170767041f1608975473c5ffa7fc7.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Conflicts:
drivers/mmc/fsl_esdhc.c
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'drivers/mmc/fsl_esdhc.c')
| -rw-r--r-- | drivers/mmc/fsl_esdhc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index cb46b13..c55eb28 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -618,7 +618,7 @@ int fsl_esdhc_initialize(bd_t *bis, struct fsl_esdhc_cfg *cfg) #endif cfg->cfg.f_min = 400000; - cfg->cfg.f_max = min(gd->arch.sdhc_clk, (u32)52000000); + cfg->cfg.f_max = min(cfg->sdhc_clk, (u32)52000000); cfg->cfg.b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT; |