Merge git://git.denx.de/u-boot-tegra

[u-boot] / drivers / mmc / Kconfig

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 0c0778111593e97a4ab48fe497e0aa3b87a659cd..560391fae249d16c42e8642feeea6165fe6ef381 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -122,6 +122,14 @@ config MMC_MXS
 
          If unsure, say N.
 
+config MMC_PCI
+       bool "Support for MMC controllers on PCI"
+       help
+         This selects PCI-based MMC controllers.
+         If you have an MMC controller on a PCI bus, say Y here.
+
+         If unsure, say N.
+
 config MMC_OMAP_HS
        bool "TI OMAP High Speed Multimedia Card Interface support"
        help
@@ -131,6 +139,18 @@ config MMC_OMAP_HS
 
          If unsure, say N.
 
+config MMC_OMAP36XX_PINS
+       bool "Enable MMC1 on OMAP36xx/37xx"
+       depends on OMAP34XX && MMC_OMAP_HS
+       help
+         This enables extended-drain in the MMC/SD/SDIO1I/O and
+         GPIO-associated I/O cells (gpio_126, gpio_127, and gpio_129)
+         specific to the OMAP36xx/37xx using MMC1
+
+         If you have a controller with this interface, say Y here.
+
+         If unsure, say N.
+
 config SH_SDHI
        bool "SuperH/Renesas ARM SoCs on-chip SDHI host controller support"
        depends on RMOBILE
@@ -287,6 +307,13 @@ config MMC_SDHCI_SPEAR
 
          If unsure, say N.
 
+config MMC_SDHCI_STI
+       bool "SDHCI support for STMicroelectronics SoC"
+       depends on MMC_SDHCI && OF_CONTROL
+       help
+         This selects the Secure Digital Host Controller Interface (SDHCI)
+         on STMicroelectronics STiH410 SoC.
+
 config MMC_SDHCI_XENON
        bool "SDHCI support for the Xenon SDHCI controller"
        depends on MMC_SDHCI && DM_MMC && OF_CONTROL
@@ -298,6 +325,20 @@ config MMC_SDHCI_XENON
 
          If unsure, say N.
 
+config MMC_SDHCI_TANGIER
+       bool "Tangier SDHCI controller support"
+       depends on DM_MMC && BLK
+       depends on MMC_SDHCI
+       help
+         This selects support for SDHCI controller on Tanginer
+         SoC. Note that this controller does not sit on PCI bus and,
+         hence, cannot be enumerated by standard PCI means.
+
+         If you're using an Intel Tangier SoC (available on Intel
+         Edison board), say Y here.
+
+         If unsure, say N.
+
 config MMC_SDHCI_TEGRA
        bool "SDHCI platform support for the Tegra SD/MMC Controller"
        depends on TEGRA
@@ -326,6 +367,17 @@ config MMC_SUNXI
 
 endif
 
+config TEGRA124_MMC_DISABLE_EXT_LOOPBACK
+       bool "Disable external clock loopback"
+       depends on MMC_SDHCI_TEGRA && TEGRA124
+       help
+         Disable the external clock loopback and use the internal one on SDMMC3
+         as per the SDMMC_VENDOR_MISC_CNTRL_0 register's SDMMC_SPARE1 bits
+         being set to 0xfffd according to the TRM.
+
+         TODO(marcel.ziswiler@toradex.com): Move to device tree controlled
+         approach once proper kernel integration made it mainline.
+
 endmenu
 
 config SYS_FSL_ERRATUM_ESDHC111