diff options
| author | Tom Rini <[email protected]> | 2019-03-29 10:53:28 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-03-29 10:53:28 -0400 |
| commit | c3aef9339ce0592b06c8d44cf2eaf9e6f3713e4f (patch) | |
| tree | ee04147c6f17f12c95b1cd7a9a53a93c2c8513e2 /drivers | |
| parent | b357ae5ed697da038d0ee6807f308f9177fcb3a7 (diff) | |
| parent | f00c26284ec0aa3e9b01ebe4996aa8fc01526d03 (diff) | |
Merge branch '2019-03-29-master-imports'
- Bugfixes:
- mmc: correct the HS400 initialization process
- configs: ti: Move FIT image load address to avoid overwrite
- lib: time: update module enable MACRO
- Add mbrugger as RPi board maintainer, correct agraf's email address.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/mmc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 89b255daf48..456c1b4cc92 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1892,8 +1892,7 @@ static int mmc_select_hs400(struct mmc *mmc) } /* Set back to HS */ - mmc_set_card_speed(mmc, MMC_HS, false); - mmc_set_clock(mmc, mmc_mode2freq(mmc, MMC_HS), false); + mmc_set_card_speed(mmc, MMC_HS, true); err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_BUS_WIDTH, EXT_CSD_BUS_WIDTH_8 | EXT_CSD_DDR_FLAG); |