Merge tag 'u-boot-imx-20200825' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[platform/kernel/u-boot.git] / drivers / mmc / Kconfig

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 8f0df56..0c252e3 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -66,7 +66,6 @@ config MMC_SPI_CRC_ON
 
 config ARM_PL180_MMCI
        bool "ARM AMBA Multimedia Card Interface and compatible support"
-       depends on DM_MMC && OF_CONTROL
        help
          This selects the ARM(R) AMBA(R) PrimeCell Multimedia Card
          Interface (PL180, PL181 and compatible) support.
@@ -264,6 +263,14 @@ config MMC_DW_SNPS
          This selects support for Synopsys DesignWare Memory Card Interface driver
          extensions used in various Synopsys ARC devboards.
 
+config NEXELL_DWMMC
+       bool "Nexell SD/MMC controller support"
+       depends on ARCH_NEXELL
+       depends on MMC_DW
+       depends on DM_MMC
+       depends on PINCTRL_NEXELL
+       default y
+
 config MMC_MESON_GX
        bool "Meson GX EMMC controller support"
        depends on DM_MMC && BLK && ARCH_MESON
@@ -298,6 +305,23 @@ config MMC_PCI
          This selects PCI-based MMC controllers.
          If you have an MMC controller on a PCI bus, say Y here.
 
+config MMC_OCTEONTX
+       bool "Marvell OcteonTX Multimedia Card Interface support"
+       depends on (ARCH_OCTEONTX || ARCH_OCTEONTX2)
+       depends on DM_MMC
+       help
+         This selects the OcteonTX Multimedia card Interface.
+         If you have an OcteonTX/TX2 board with a Multimedia Card slot,
+         say Y here.
+
+         If unsure, say N.
+
+config PXA_MMC_GENERIC
+       bool "Support for MMC controllers on PXA"
+       help
+         This selects MMC controllers on PXA.
+         If you are on a PXA architecture, say Y here.
+
          If unsure, say N.
 
 config MMC_OMAP_HS
@@ -616,7 +640,7 @@ config MMC_SDHCI_TANGIER
 
 config MMC_SDHCI_TEGRA
        bool "SDHCI platform support for the Tegra SD/MMC Controller"
-       depends on TEGRA
+       depends on ARCH_TEGRA
        select BOUNCE_BUFFER
        default y
        help
@@ -638,7 +662,6 @@ config TEGRA124_MMC_DISABLE_EXT_LOOPBACK
 
 config MMC_SDHCI_ZYNQ
        bool "Arasan SDHCI controller support"
-       depends on ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL
        depends on DM_MMC && OF_CONTROL && BLK
        depends on MMC_SDHCI
        help
@@ -727,6 +750,21 @@ config FSL_ESDHC
          This selects support for the eSDHC (Enhanced Secure Digital Host
          Controller) found on numerous Freescale/NXP SoCs.
 
+config FSL_ESDHC_33V_IO_RELIABILITY_WORKAROUND
+       bool "enable eSDHC workaround for 3.3v IO reliability issue"
+       depends on FSL_ESDHC && DM_MMC
+       default n
+       help
+         When eSDHC operates at 3.3v, damage can accumulate in an internal
+         level shifter at a higher than expected rate. The faster the interface
+         runs, the more damage accumulates. This issue now is found on LX2160A
+         eSDHC1 for only SD card. The hardware workaround is recommended to use
+         an on-board level shifter that is 1.8v on SoC side and 3.3v on SD card
+         side. For boards without hardware workaround, this option could be
+         enabled, ensuring 1.8v IO voltage and disabling eSDHC if no card.
+         This option assumes no hotplug, and u-boot has to make all the way to
+         to linux to use 1.8v UHS-I speed mode if has card.
+
 config FSL_ESDHC_IMX
        bool "Freescale/NXP i.MX eSDHC controller support"
        help