From: Linus Torvalds Date: Thu, 20 Dec 2018 15:25:31 +0000 (-0800) Subject: Merge tag 'mmc-v4.20-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc X-Git-Tag: v5.4-rc1~2040 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d31aeb78c6827db17f447f0504fc35afcbb188c2;p=platform%2Fkernel%2Flinux-rpi.git Merge tag 'mmc-v4.20-rc7' of git://git./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 --- d31aeb78c6827db17f447f0504fc35afcbb188c2