diff options
| author | Tom Rini <[email protected]> | 2019-03-26 23:19:11 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-03-26 23:19:11 -0400 |
| commit | d32519ac8a4483803975b5aa4ef4f5affe1964bc (patch) | |
| tree | c7ffa2fbcbccfd5f1121966d9046b6dfe2659d5b /drivers/mmc | |
| parent | 2b9b9cdd5f9ae1cbc786ba3c2255a51b3ea4a636 (diff) | |
| parent | c453fe3a0513f758c7d0b580307909637eb31c9f (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-sh
- Various fixes for bugs found by u-boot test.py
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/sh_mmcif.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/tmio-common.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/mmc/sh_mmcif.c b/drivers/mmc/sh_mmcif.c index 306daf14155..c8875ce8f81 100644 --- a/drivers/mmc/sh_mmcif.c +++ b/drivers/mmc/sh_mmcif.c @@ -696,7 +696,7 @@ static int sh_mmcif_dm_probe(struct udevice *dev) return ret; } - host->clk = clk_get_rate(&sh_mmcif_clk); + host->clk = clk_set_rate(&sh_mmcif_clk, 97500000); plat->cfg.name = dev->name; plat->cfg.host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS; diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c index 01d8c2b9254..812205a21f6 100644 --- a/drivers/mmc/tmio-common.c +++ b/drivers/mmc/tmio-common.c @@ -783,7 +783,10 @@ int tmio_sd_probe(struct udevice *dev, u32 quirks) plat->cfg.f_min = mclk / (priv->caps & TMIO_SD_CAP_DIV1024 ? 1024 : 512); plat->cfg.f_max = mclk; - plat->cfg.b_max = U32_MAX; /* max value of TMIO_SD_SECCNT */ + if (quirks & TMIO_SD_CAP_16BIT) + plat->cfg.b_max = U16_MAX; /* max value of TMIO_SD_SECCNT */ + else + plat->cfg.b_max = U32_MAX; /* max value of TMIO_SD_SECCNT */ upriv->mmc = &plat->mmc; |