diff options
| author | Tom Rini <trini@ti.com> | 2012-11-05 07:42:00 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-11-05 07:42:00 -0700 |
| commit | 6acc7c3cbc05873d62118640cf964e9c9665804c (patch) | |
| tree | 448da0bf67e0c4fa2ff033a67036ef96c7530697 /drivers/mmc | |
| parent | a6e8dcaf350fe8e780e29c57ececfece039725c7 (diff) | |
| parent | 46d626d3926cf6b9f9c477782c5a0ee620a424cd (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/fsl_esdhc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index 301dd8c7b9..e93e38ac43 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -412,10 +412,10 @@ esdhc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data) static void set_sysctl(struct mmc *mmc, uint clock) { - int sdhc_clk = gd->sdhc_clk; int div, pre_div; struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; volatile struct fsl_esdhc *regs = (struct fsl_esdhc *)cfg->esdhc_base; + int sdhc_clk = cfg->sdhc_clk; uint clk; if (clock < mmc->f_min) @@ -598,6 +598,7 @@ int fsl_esdhc_mmc_init(bd_t *bis) cfg = malloc(sizeof(struct fsl_esdhc_cfg)); memset(cfg, 0, sizeof(struct fsl_esdhc_cfg)); cfg->esdhc_base = CONFIG_SYS_FSL_ESDHC_ADDR; + cfg->sdhc_clk = gd->sdhc_clk; return fsl_esdhc_initialize(bis, cfg); } |