diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-10-27 11:43:17 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-10-27 11:43:17 +0200 |
| commit | f04821a8ca714459481bd9fd315af2b5f92d99a6 (patch) | |
| tree | cf5ec812082840d228f67ef82e8be4d647ff3322 /drivers/mmc | |
| parent | b68d6712c379735e886ef9c01b946bc36f295273 (diff) | |
| parent | 01968b96a24414ff8f0735111907cbb750c7af43 (diff) | |
| download | blackbird-obmc-uboot-f04821a8ca714459481bd9fd315af2b5f92d99a6.tar.gz blackbird-obmc-uboot-f04821a8ca714459481bd9fd315af2b5f92d99a6.zip | |
Merge remote-tracking branch 'u-boot-imx/master'
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/fsl_esdhc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index 3f8d30db4c..aa6a9f13ea 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -410,12 +410,12 @@ esdhc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data) return 0; } -void set_sysctl(struct mmc *mmc, uint clock) +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); } |
