From: Tom Rini <trini@ti.com>
Date: Wed, 26 Nov 2014 16:22:29 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
X-Git-Tag: v2015.01-rc3~52
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=21008ad6384170767041f1608975473c5ffa7fc7;p=u-boot

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>
---

21008ad6384170767041f1608975473c5ffa7fc7
diff --cc drivers/mmc/fsl_esdhc.c
index cb46b13cbd,8a1a461ccf..c55eb28217
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@@ -618,7 -610,7 +618,7 @@@ int fsl_esdhc_initialize(bd_t *bis, str
  #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, 52000000);
++	cfg->cfg.f_max = min(cfg->sdhc_clk, (u32)52000000);
  
  	cfg->cfg.b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT;