Merge tag 'mmc-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

Pull MMC updates from Ulf Hansson:
 "MMC core:
   - Export host capabilities through debugfs
   - Export card RCA register via sysfs
   - Improve card initializing sequence while enabling 4-bit bus
   - Export a function to enable/disable wakeup for card detect IRQ

  MMC host:
   - dw_mmc: Add support for new hi3798cv200 variant
   - dw_mmc: Remove support for some deprecated DT properties
   - mediatek: Add support for new variant used on MT7622 SoC
   - sdhci: Improve wakeup support for SDIO IRQs
   - sdhci: Improve wakeup support for card detect IRQs
   - sdhci-omap: Add tuning support
   - sdhci_omap: Add UHS-I mode support
   - sunxi: Prepare for runtime PM support via a few re-factorings
   - tmio: deprecate "toshiba,mmc-wrprotect-disable" DT property
   - tmio/renesas_sdhi: Consolidate code supporting write protect
   - tmio: Improve DMA vs PIO handling
   - tmio: Add support for IP-builtin card detection logic"

* tag 'mmc-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (55 commits)
  mmc: renesas_sdhi: replace EXT_ACC with HOST_MODE
  mmc: update sdio_claim_irq documentation
  mmc: Export host capabilities to debugfs.
  mmc: core: Disable HPI for certain Micron (Numonyx) eMMC cards
  mmc: block: fix updating ext_csd caches on ioctl call
  mmc: sunxi: Set our device drvdata earlier
  mmc: sunxi: Move the reset deassertion before enabling the clocks
  mmc: sunxi: Move resources management to separate functions
  mmc: dw_mmc: add support for hi3798cv200 specific extensions of dw-mshc
  dt-bindings: mmc: add bindings for hi3798cv200-dw-mshc
  mmc: core: Export card RCA register via sysfs
  mmc: renesas_sdhi: fix WP detection
  mmc: core: Use memdup_user() rather than duplicating its implementation
  mmc: dw_mmc-rockchip: correct property names in debug
  mmc: sd: Remove redundant err assignment from mmc_read_switch
  mmc: sdio: Check the return value of sdio_enable_4bit_bus
  mmc: core: Don't try UHS-I mode if 4-bit mode isn't supported
  arm64: dts: hi3660: remove 'num-slots' property for dwmmc
  ARM: dts: lpc18xx: remove 'num-slots' property for dwmmc
  arm64: dts: stratix10: remove 'num-slots' property for dwmmc
  ...

diff --combined drivers/mmc/host/Kconfig
index b4fd5d48dd35be3fc5b6ce99fabc55e78f8c9e45,de36fffe8225e444c0c52660f6715afcf5da3145..9589f9c9046f14b18b24614cb524b8574eb08991
--- 1/drivers/mmc/host/Kconfig
--- 2/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@@ -646,6 -646,25 +646,6 @@@ config MMC_VIA_SDMM
  
          If unsure, say N.
  
 -config SDH_BFIN
 -      tristate "Blackfin Secure Digital Host support"
 -      depends on (BF54x && !BF544) || (BF51x && !BF512)
 -      help
 -        If you say yes here you will get support for the Blackfin on-chip
 -        Secure Digital Host interface.  This includes support for MMC and
 -        SD cards.
 -
 -        To compile this driver as a module, choose M here: the
 -        module will be called bfin_sdh.
 -
 -        If unsure, say N.
 -
 -config SDH_BFIN_MISSING_CMD_PULLUP_WORKAROUND
 -      bool "Blackfin EZkit Missing SDH_CMD Pull Up Resistor Workaround"
 -      depends on SDH_BFIN
 -      help
 -        If you say yes here SD-Cards may work on the EZkit.
 -
  config MMC_CAVIUM_OCTEON
        tristate "Cavium OCTEON SD/MMC Card Interface support"
        depends on CAVIUM_OCTEON_SOC
@@@ -699,6 -718,15 +699,15 @@@ config MMC_DW_EXYNO
          Synopsys DesignWare Memory Card Interface driver. Select this option
          for platforms based on Exynos4 and Exynos5 SoC's.
  
+ config MMC_DW_HI3798CV200
+       tristate "Hi3798CV200 specific extensions for Synopsys DW Memory Card Interface"
+       depends on MMC_DW
+       select MMC_DW_PLTFM
+       help
+         This selects support for HiSilicon Hi3798CV200 SoC specific extensions to the
+         Synopsys DesignWare Memory Card Interface driver. Select this option
+         for platforms based on HiSilicon Hi3798CV200 SoC.
+ 
  config MMC_DW_K3
        tristate "K3 specific extensions for Synopsys DW Memory Card Interface"
        depends on MMC_DW

diff --combined drivers/mmc/host/Makefile
index f563cc0b7f935f20792f0fa3af054773384efbdb,00ec9a2f59be92a0f956b50e887a8dbda096fd6e..6aead24879b4225d60c8ae1432ee047882becfd7
--- 1/drivers/mmc/host/Makefile
--- 2/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@@ -43,6 -43,7 +43,6 @@@ obj-$(CONFIG_MMC_SDHI_SYS_DMAC)               += ren
  obj-$(CONFIG_MMC_SDHI_INTERNAL_DMAC)  += renesas_sdhi_internal_dmac.o
  obj-$(CONFIG_MMC_CB710)               += cb710-mmc.o
  obj-$(CONFIG_MMC_VIA_SDMMC)   += via-sdmmc.o
 -obj-$(CONFIG_SDH_BFIN)                += bfin_sdh.o
  octeon-mmc-objs := cavium.o cavium-octeon.o
  obj-$(CONFIG_MMC_CAVIUM_OCTEON) += octeon-mmc.o
  thunderx-mmc-objs := cavium.o cavium-thunderx.o
@@@ -50,6 -51,7 +50,7 @@@ obj-$(CONFIG_MMC_CAVIUM_THUNDERX) += th
  obj-$(CONFIG_MMC_DW)          += dw_mmc.o
  obj-$(CONFIG_MMC_DW_PLTFM)    += dw_mmc-pltfm.o
  obj-$(CONFIG_MMC_DW_EXYNOS)   += dw_mmc-exynos.o
+ obj-$(CONFIG_MMC_DW_HI3798CV200) += dw_mmc-hi3798cv200.o
  obj-$(CONFIG_MMC_DW_K3)               += dw_mmc-k3.o
  obj-$(CONFIG_MMC_DW_PCI)      += dw_mmc-pci.o
  obj-$(CONFIG_MMC_DW_ROCKCHIP) += dw_mmc-rockchip.o