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>

diff --cc drivers/mmc/fsl_esdhc.c
index cb46b13cbd37de6fbf905d34ffee2672dc90d364,8a1a461ccf5ae8c47bf0c1ca050839d9fd417ba4..c55eb28217bc5920c3137016dc71b8a6cd58b4b4
--- 1/drivers/mmc/fsl_esdhc.c
--- 2/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;