diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-20 07:25:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-20 07:25:31 -0800 |
| commit | d31aeb78c6827db17f447f0504fc35afcbb188c2 (patch) | |
| tree | 7edf9ce9d2532d151001f064d590ba13819203bf /arch/sh/include/asm/io.h | |
| parent | iomap: Revert "fs/iomap.c: get/put the page in iomap_page_create/release()" (diff) | |
| parent | mmc: core: Use a minimum 1600ms timeout when enabling CACHE ctrl (diff) | |
| download | linux-dev-d31aeb78c6827db17f447f0504fc35afcbb188c2.tar.xz linux-dev-d31aeb78c6827db17f447f0504fc35afcbb188c2.zip | |
Merge tag 'mmc-v4.20-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
Pull MMC fixes from Ulf Hansson:
"MMC core:
- Restore code to allow BKOPS and CACHE ctrl even if no HPI support
- Reset HPI enabled state during re-init
- Use a default minimum timeout when enabling CACHE ctrl
MMC host:
- omap_hsmmc: Fix DMA API warning
- sdhci-tegra: Fix dt parsing of SDMMC pads autocal values
- Correct register accesses when enabling v4 mode"
* tag 'mmc-v4.20-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
mmc: core: Use a minimum 1600ms timeout when enabling CACHE ctrl
mmc: core: Allow BKOPS and CACHE ctrl even if no HPI support
mmc: core: Reset HPI enabled state during re-init and in case of errors
mmc: omap_hsmmc: fix DMA API warning
mmc: tegra: Fix for SDMMC pads autocal parsing from dt
mmc: sdhci: Fix sdhci_do_enable_v4_mode
Diffstat (limited to 'arch/sh/include/asm/io.h')
0 files changed, 0 insertions, 0 deletions