diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-05 11:15:26 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-05 11:15:26 +0200 |
| commit | 19d829fa60fc4e6df514a046142faaaf9fc8185d (patch) | |
| tree | 295c75b0d9f3c7180f23ec131442286cf91db5b1 /drivers/mmc | |
| parent | e62d5fb0da76ef168e90cae9bbbda80349aaf137 (diff) | |
| parent | 8467faef7fce8c5faad7224b7737a58e16c52186 (diff) | |
| download | u-boot-imx-19d829fa60fc4e6df514a046142faaaf9fc8185d.zip u-boot-imx-19d829fa60fc4e6df514a046142faaaf9fc8185d.tar.gz u-boot-imx-19d829fa60fc4e6df514a046142faaaf9fc8185d.tar.bz2 | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Conflicts:
drivers/serial/serial.c
The conflict above was a trivial case of adding one init
function in each branch, and manually resolved in merge.
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/mxsmmc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c index e5a5d75..245f9d0 100644 --- a/drivers/mmc/mxsmmc.c +++ b/drivers/mmc/mxsmmc.c @@ -410,7 +410,8 @@ int mxsmmc_initialize(bd_t *bis, int id, int (*wp)(int), int (*cd)(int)) mmc->voltages = MMC_VDD_32_33 | MMC_VDD_33_34; mmc->host_caps = MMC_MODE_4BIT | MMC_MODE_8BIT | - MMC_MODE_HS_52MHz | MMC_MODE_HS; + MMC_MODE_HS_52MHz | MMC_MODE_HS | + MMC_MODE_HC; /* * SSPCLK = 480 * 18 / 29 / 1 = 297.731 MHz |