Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[karo-tx-linux.git] / drivers / mmc / host / Kconfig

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index f08691a58d7e02220e8a3ef7d6c552eef7c2a79d..2db84dd664d7616f5fc07bd12a794b822f72b1fb 100644 (file)
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -622,6 +622,27 @@ config SDH_BFIN_MISSING_CMD_PULLUP_WORKAROUND
        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
+       help
+         This selects Cavium OCTEON SD/MMC card Interface.
+         If you have an OCTEON board with a Multimedia Card slot,
+         say Y or M here.
+
+         If unsure, say N.
+
+config MMC_CAVIUM_THUNDERX
+       tristate "Cavium ThunderX SD/MMC Card Interface support"
+       depends on PCI && 64BIT && (ARM64 || COMPILE_TEST)
+       depends on GPIOLIB
+       depends on OF_ADDRESS
+       help
+         This selects Cavium ThunderX SD/MMC Card Interface.
+         If you have an Cavium ARM64 board with a Multimedia Card slot
+         or builtin eMMC chip say Y or M here. If built as a module
+         the module will be called thunderx_mmc.ko.
+
 config MMC_DW
        tristate "Synopsys DesignWare Memory Card Interface"
        depends on HAS_DMA
@@ -799,6 +820,20 @@ config MMC_TOSHIBA_PCI
        depends on PCI
        help
 
+config MMC_BCM2835
+       tristate "Broadcom BCM2835 SDHOST MMC Controller support"
+       depends on ARCH_BCM2835 || COMPILE_TEST
+       depends on HAS_DMA
+       help
+         This selects the BCM2835 SDHOST MMC controller. If you have
+         a BCM2835 platform with SD or MMC devices, say Y or M here.
+
+         Note that the BCM2835 has two SD controllers: The Arasan
+         sdhci controller (supported by MMC_SDHCI_IPROC) and a custom
+         sdhost controller (supported by this driver).
+
+         If unsure, say N.
+
 config MMC_MTK
        tristate "MediaTek SD/MMC Card Interface support"
        depends on HAS_DMA
@@ -828,3 +863,11 @@ config MMC_SDHCI_BRCMSTB
          Broadcom STB SoCs.
 
          If unsure, say Y.
+
+config MMC_SDHCI_XENON
+       tristate "Marvell Xenon eMMC/SD/SDIO SDHCI driver"
+       depends on MMC_SDHCI_PLTFM
+       help
+         This selects Marvell Xenon eMMC/SD/SDIO SDHCI.
+         If you have a controller with this interface, say Y or M here.
+         If unsure, say N.