Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: (42 commits)
  atmel-mci: fix sdc_reg typo
  tmio_mmc: add maintainer
  mmc: Add OpenFirmware bindings for SDHCI driver
  sdhci: Add quirk for forcing maximum block size to 2048 bytes
  sdhci: Add quirk for controllers that need IRQ re-init after reset
  sdhci: Add quirk for controllers that need small delays for PIO
  sdhci: Add set_clock callback and a quirk for nonstandard clocks
  sdhci: Add get_{max,timeout}_clock callbacks
  sdhci: Add support for hosts reporting inverted write-protect state
  sdhci: Add support for card-detection polling
  sdhci: Enable only relevant (DMA/PIO) interrupts during transfers
  sdhci: Split card-detection IRQs management from sdhci_init()
  sdhci: Add support for bus-specific IO memory accessors
  mmc_spi: adjust for delayed data token response
  omap_hsmmc: Wait for SDBP
  omap_hsmmc: Fix MMC3 dma
  omap_hsmmc: Disable SDBP at suspend
  omap_hsmmc: Do not prefix slot name
  omap_hsmmc: Allow cover switch to cause rescan
  omap_hsmmc: Add 8-bit bus width mode support
  ...

1 files changed, 29 insertions, 0 deletions

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 6fbb246c40bb..b4cf691f3f64 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -37,6 +37,13 @@ config MMC_SDHCI
 
           If unsure, say N.
 
+config MMC_SDHCI_IO_ACCESSORS
+        bool
+        depends on MMC_SDHCI
+        help
+          This is silent Kconfig symbol that is selected by the drivers that
+          need to overwrite SDHCI IO memory accessors.
+
 config MMC_SDHCI_PCI
         tristate "SDHCI support on PCI bus"
         depends on MMC_SDHCI && PCI
@@ -65,6 +72,17 @@ config MMC_RICOH_MMC
 
           If unsure, say Y.
 
+config MMC_SDHCI_OF
+        tristate "SDHCI support on OpenFirmware platforms"
+        depends on MMC_SDHCI && PPC_OF
+        select MMC_SDHCI_IO_ACCESSORS
+        help
+          This selects the OF support for Secure Digital Host Controller
+          Interfaces. So far, only the Freescale eSDHC controller is known
+          to exist on OF platforms.
+
+          If unsure, say N.
+
 config MMC_OMAP
         tristate "TI OMAP Multimedia Card Interface support"
         depends on ARCH_OMAP
@@ -171,6 +189,17 @@ config MMC_TIFM_SD
           To compile this driver as a module, choose M here: the
           module will be called tifm_sd.
 
+config MMC_MVSDIO
+        tristate "Marvell MMC/SD/SDIO host driver"
+        depends on PLAT_ORION
+        ---help---
+          This selects the Marvell SDIO host driver.
+          SDIO may currently be found on the Kirkwood 88F6281 and 88F6192
+          SoC controllers.
+
+          To compile this driver as a module, choose M here: the
+          module will be called mvsdio.
+
 config MMC_SPI
         tristate "MMC/SD/SDIO over SPI"
         depends on SPI_MASTER && !HIGHMEM && HAS_DMA