mmc: initialize an err variable

[J-u-boot.git] / drivers / mmc / Kconfig

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 556b3ac489787d02d5379cb859871d81177274c0..f8ea92172e44226dc902ebda009f4cd4557bdcb2 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -46,6 +46,9 @@ config SPL_DM_MMC
 
 if MMC
 
+config MMC_SDHCI_ADMA_HELPERS
+       bool
+
 config MMC_SPI
        bool "Support for SPI-based MMC controller"
        depends on DM_MMC && DM_SPI
@@ -305,6 +308,15 @@ 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
@@ -436,6 +448,7 @@ config MMC_SDHCI_SDMA
 config MMC_SDHCI_ADMA
        bool "Support SDHCI ADMA2"
        depends on MMC_SDHCI
+       select MMC_SDHCI_ADMA_HELPERS
        help
          This enables support for the ADMA (Advanced DMA) defined
          in the SD Host Controller Standard Specification Version 3.00
@@ -443,6 +456,7 @@ config MMC_SDHCI_ADMA
 config SPL_MMC_SDHCI_ADMA
        bool "Support SDHCI ADMA2 in SPL"
        depends on MMC_SDHCI
+       select MMC_SDHCI_ADMA_HELPERS
        help
          This enables support for the ADMA (Advanced DMA) defined
          in the SD Host Controller Standard Specification Version 3.00 in SPL.
@@ -512,6 +526,7 @@ config MMC_SDHCI_AM654
        depends on MMC_SDHCI
        depends on DM_MMC && OF_CONTROL && BLK
        depends on REGMAP
+       select MMC_SDHCI_IO_ACCESSORS
        help
          Support for Secure Digital Host Controller Interface (SDHCI)
          controllers present on TI's AM654 SOCs.
@@ -653,7 +668,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
@@ -742,6 +756,14 @@ config FSL_ESDHC
          This selects support for the eSDHC (Enhanced Secure Digital Host
          Controller) found on numerous Freescale/NXP SoCs.
 
+config FSL_ESDHC_SUPPORT_ADMA2
+       bool "enable ADMA2 support"
+       depends on FSL_ESDHC
+       select MMC_SDHCI_ADMA_HELPERS
+       help
+         This enables support for the ADMA2 transfer mode. If supported by the
+         eSDHC it will allow 64bit DMA addresses.
+
 config FSL_ESDHC_33V_IO_RELIABILITY_WORKAROUND
        bool "enable eSDHC workaround for 3.3v IO reliability issue"
        depends on FSL_ESDHC && DM_MMC