Merge branch 'master' of git://git.denx.de/u-boot-mmc

[people/ms/u-boot.git] / drivers / mmc / Kconfig

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 077b184d3b70fdfdccc14cfbacb7c4ce70b2d646..56c352e72a0210ea417a8348581af971c9ba529b 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -10,10 +10,6 @@ config MMC
          If you want MMC/SD/SDIO support, you should say Y here and
          also to your specific host controller driver.
 
-config GENERIC_MMC
-       bool "Generic MMC driver framework"
-       default MMC
-
 config DM_MMC
        bool "Enable MMC controllers using Driver Model"
        depends on DM
@@ -24,15 +20,16 @@ config DM_MMC
          appear as block devices in U-Boot and can support filesystems such
          as EXT4 and FAT.
 
-config DM_MMC_OPS
-       bool "Support MMC controller operations using Driver Model"
-       depends on DM_MMC
-       default y if DM_MMC
+config SPL_DM_MMC
+       bool "Enable MMC controllers using Driver Model in SPL"
+       depends on SPL_DM && DM_MMC
+       default y
        help
-         Driver model provides a means of supporting device operations. This
-         option moves MMC operations under the control of driver model. The
-         option will be removed as soon as all DM_MMC drivers use it, as it
-         will the only supported behaviour.
+         This enables the MultiMediaCard (MMC) uclass which supports MMC and
+         Secure Digital I/O (SDIO) cards. Both removable (SD, micro-SD, etc.)
+         and non-removable (e.g. eMMC chip) devices are supported. These
+         appear as block devices in U-Boot and can support filesystems such
+         as EXT4 and FAT.
 
 if MMC
 
@@ -107,7 +104,7 @@ config MMC_DW_SOCFPGA
 
 config MMC_MESON_GX
        bool "Meson GX EMMC controller support"
-       depends on DM_MMC && BLK && DM_MMC_OPS && ARCH_MESON
+       depends on DM_MMC && BLK && ARCH_MESON
        help
         Support for EMMC host controller on Meson GX ARM SoCs platform (S905)
 
@@ -138,6 +135,7 @@ config MMC_PCI
 
 config MMC_OMAP_HS
        bool "TI OMAP High Speed Multimedia Card Interface support"
+       select DM_REGULATOR_PBIAS if DM_MMC && DM_REGULATOR
        help
          This selects the TI OMAP High Speed Multimedia card Interface.
          If you have an omap2plus board with a Multimedia Card slot,
@@ -159,14 +157,14 @@ config MMC_OMAP36XX_PINS
 
 config SH_SDHI
        bool "SuperH/Renesas ARM SoCs on-chip SDHI host controller support"
-       depends on RMOBILE
+       depends on ARCH_RMOBILE
        help
          Support for the on-chip SDHI host controller on SuperH/Renesas ARM SoCs platform
 
 config MMC_UNIPHIER
        bool "UniPhier SD/MMC Host Controller support"
        depends on ARCH_UNIPHIER
-       depends on BLK && DM_MMC_OPS
+       depends on BLK && DM_MMC
        depends on OF_CONTROL
        help
          This selects support for the SD/MMC Host Controller on UniPhier SoCs.
@@ -174,7 +172,7 @@ config MMC_UNIPHIER
 config MMC_SANDBOX
        bool "Sandbox MMC support"
        depends on SANDBOX
-       depends on BLK && DM_MMC_OPS && OF_CONTROL
+       depends on BLK && DM_MMC && OF_CONTROL
        help
          This select a dummy sandbox MMC driver. At present this does nothing
          other than allow sandbox to be build with MMC support. This
@@ -209,7 +207,7 @@ config MMC_SDHCI_SDMA
 config MMC_SDHCI_ATMEL
        bool "Atmel SDHCI controller support"
        depends on ARCH_AT91
-       depends on DM_MMC && BLK && DM_MMC_OPS && ARCH_AT91
+       depends on DM_MMC && BLK && ARCH_AT91
        depends on MMC_SDHCI
        help
          This enables support for the Atmel SDHCI controller, which supports
@@ -233,7 +231,7 @@ config MMC_SDHCI_BCM2835
 
 config MMC_SDHCI_CADENCE
        bool "SDHCI support for the Cadence SD/SDIO/eMMC controller"
-       depends on BLK && DM_MMC_OPS
+       depends on BLK && DM_MMC
        depends on MMC_SDHCI
        depends on OF_CONTROL
        help
@@ -255,7 +253,7 @@ config MMC_SDHCI_KONA
 
 config MMC_SDHCI_MSM
        bool "Qualcomm SDHCI controller"
-       depends on BLK && DM_MMC_OPS
+       depends on BLK && DM_MMC
        depends on MMC_SDHCI
        help
          Enables support for SDHCI 2.0 controller present on some Qualcomm
@@ -285,7 +283,7 @@ config MMC_SDHCI_PIC32
 config MMC_SDHCI_ROCKCHIP
        bool "Arasan SDHCI controller for Rockchip support"
        depends on ARCH_ROCKCHIP
-       depends on DM_MMC && BLK && DM_MMC_OPS
+       depends on DM_MMC && BLK
        depends on MMC_SDHCI
        help
          Support for Arasan SDHCI host controller on Rockchip ARM SoCs platform
@@ -358,7 +356,7 @@ config MMC_SDHCI_TEGRA
 config MMC_SDHCI_ZYNQ
        bool "Arasan SDHCI controller support"
        depends on ARCH_ZYNQ || ARCH_ZYNQMP
-       depends on DM_MMC && OF_CONTROL && BLK && DM_MMC_OPS
+       depends on DM_MMC && OF_CONTROL && BLK
        depends on MMC_SDHCI
        help
          Support for Arasan SDHCI host controller on Zynq/ZynqMP ARM SoCs platform
@@ -371,6 +369,15 @@ config MMC_SUNXI
          This selects support for the SD/MMC Host Controller on
          Allwinner sunxi SoCs.
 
+config GENERIC_ATMEL_MCI
+       bool "Atmel Multimedia Card Interface support"
+       depends on DM_MMC && BLK && ARCH_AT91
+       help
+         This enables support for Atmel High Speed Multimedia Card Interface
+         (HSMCI), which supports the MultiMedia Card (MMC) Specification V4.3,
+         the SD Memory Card Specification V2.0, the SDIO V2.0 specification
+         and CE-ATA V1.1.
+
 endif
 
 config TEGRA124_MMC_DISABLE_EXT_LOOPBACK