Merge branch 'next'

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

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 85fd1906bdf710351d14a7c3beb62be034f68b72..bb38787eca619c6bdc453949c816e6455a15d5fb 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -79,7 +79,7 @@ config MMC_QUIRKS
        help
          Some cards and hosts may sometimes behave unexpectedly (quirks).
          This option enable workarounds to handle those quirks. Some of them
-         are enabled by default, other may require additionnal flags or are
+         are enabled by default, other may require additional flags or are
          enabled by the host driver.
 
 config MMC_HW_PARTITIONING
@@ -205,6 +205,17 @@ config MMC_DW
          block, this provides host support for SD and MMC interfaces, in both
          PIO, internal DMA mode and external DMA mode.
 
+config MMC_DW_CORTINA
+       bool "Cortina specific extensions for Synopsys DW Memory Card Interface"
+       depends on DM_MMC
+       depends on MMC_DW
+       depends on BLK
+       default n
+       help
+         This selects support for Cortina SoC specific extensions to the
+         Synopsys DesignWare Memory Card Interface driver. Select this option
+         for platforms based on Cortina CAxxxx Soc's.
+
 config MMC_DW_EXYNOS
        bool "Exynos specific extensions for Synopsys DW Memory Card Interface"
        depends on ARCH_EXYNOS
@@ -711,19 +722,10 @@ endif
 
 config FSL_ESDHC
        bool "Freescale/NXP eSDHC controller support"
-       select FSL_ESDHC_USE_PERIPHERAL_CLK if MMC_HS200_SUPPORT || MMC_UHS_SUPPORT
        help
          This selects support for the eSDHC (Enhanced Secure Digital Host
          Controller) found on numerous Freescale/NXP SoCs.
 
-config FSL_ESDHC_USE_PERIPHERAL_CLK
-       bool "enable ESDHC peripheral clock support"
-       depends on FSL_ESDHC
-       help
-         eSDHC supports two reference clocks (platform clock and peripheral clock).
-         Peripheral clock which could provide higher clock frequency is required to
-         be used for tuning of SD UHS mode and eMMC HS200/HS400 modes.
-
 config FSL_ESDHC_IMX
        bool "Freescale/NXP i.MX eSDHC controller support"
        help
@@ -732,7 +734,7 @@ config FSL_ESDHC_IMX
 
 config FSL_USDHC
        bool "Freescale/NXP i.MX uSDHC controller support"
-       depends on MX6 || MX7 ||ARCH_MX7ULP || IMX8 || IMX8M || TARGET_S32V234EVB
+       depends on MX6 || MX7 ||ARCH_MX7ULP || IMX8 || IMX8M || IMXRT || TARGET_S32V234EVB
        select FSL_ESDHC_IMX
        help
          This enables the Ultra Secured Digital Host Controller enhancements