@ -20,16 +20,6 @@ config DM_MMC
appear as block devices in U-Boot and can support filesystems such
appear as block devices in U-Boot and can support filesystems such
as EXT4 and FAT.
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
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.
config SPL_DM_MMC
config SPL_DM_MMC
bool "Enable MMC controllers using Driver Model in SPL"
bool "Enable MMC controllers using Driver Model in SPL"
depends on SPL_DM && DM_MMC
depends on SPL_DM && DM_MMC
@ -41,16 +31,6 @@ config SPL_DM_MMC
appear as block devices in U-Boot and can support filesystems such
appear as block devices in U-Boot and can support filesystems such
as EXT4 and FAT.
as EXT4 and FAT.
config SPL_DM_MMC_OPS
bool "Support MMC controller operations using Driver Model in SPL"
depends on SPL_DM_MMC && DM_MMC_OPS
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.
if MMC
if MMC
config SPL_MMC_TINY
config SPL_MMC_TINY
@ -124,7 +104,7 @@ config MMC_DW_SOCFPGA
config MMC_MESON_GX
config MMC_MESON_GX
bool "Meson GX EMMC controller support"
bool "Meson GX EMMC controller support"
depends on DM_MMC && BLK && DM_MMC_OPS && ARCH_MESON
depends on DM_MMC && BLK && ARCH_MESON
help
help
Support for EMMC host controller on Meson GX ARM SoCs platform (S905)
Support for EMMC host controller on Meson GX ARM SoCs platform (S905)
@ -155,7 +135,7 @@ config MMC_PCI
config MMC_OMAP_HS
config MMC_OMAP_HS
bool "TI OMAP High Speed Multimedia Card Interface support"
bool "TI OMAP High Speed Multimedia Card Interface support"
select DM_MMC_OPS if DM_MMC
select DM_REGULATOR_PBIAS if DM_MMC && DM_REGULATOR
help
help
This selects the TI OMAP High Speed Multimedia card Interface.
This selects the TI OMAP High Speed Multimedia card Interface.
If you have an omap2plus board with a Multimedia Card slot,
If you have an omap2plus board with a Multimedia Card slot,
@ -184,7 +164,7 @@ config SH_SDHI
config MMC_UNIPHIER
config MMC_UNIPHIER
bool "UniPhier SD/MMC Host Controller support"
bool "UniPhier SD/MMC Host Controller support"
depends on ARCH_UNIPHIER
depends on ARCH_UNIPHIER
depends on BLK && DM_MMC_OPS
depends on BLK && DM_MMC
depends on OF_CONTROL
depends on OF_CONTROL
help
help
This selects support for the SD/MMC Host Controller on UniPhier SoCs.
This selects support for the SD/MMC Host Controller on UniPhier SoCs.
@ -192,7 +172,7 @@ config MMC_UNIPHIER
config MMC_SANDBOX
config MMC_SANDBOX
bool "Sandbox MMC support"
bool "Sandbox MMC support"
depends on SANDBOX
depends on SANDBOX
depends on BLK && DM_MMC_OPS && OF_CONTROL
depends on BLK && DM_MMC && OF_CONTROL
help
help
This select a dummy sandbox MMC driver. At present this does nothing
This select a dummy sandbox MMC driver. At present this does nothing
other than allow sandbox to be build with MMC support. This
other than allow sandbox to be build with MMC support. This
@ -227,7 +207,7 @@ config MMC_SDHCI_SDMA
config MMC_SDHCI_ATMEL
config MMC_SDHCI_ATMEL
bool "Atmel SDHCI controller support"
bool "Atmel SDHCI controller support"
depends on ARCH_AT91
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
depends on MMC_SDHCI
help
help
This enables support for the Atmel SDHCI controller, which supports
This enables support for the Atmel SDHCI controller, which supports
@ -251,7 +231,7 @@ config MMC_SDHCI_BCM2835
config MMC_SDHCI_CADENCE
config MMC_SDHCI_CADENCE
bool "SDHCI support for the Cadence SD/SDIO/eMMC controller"
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 MMC_SDHCI
depends on OF_CONTROL
depends on OF_CONTROL
help
help
@ -273,7 +253,7 @@ config MMC_SDHCI_KONA
config MMC_SDHCI_MSM
config MMC_SDHCI_MSM
bool "Qualcomm SDHCI controller"
bool "Qualcomm SDHCI controller"
depends on BLK && DM_MMC_OPS
depends on BLK && DM_MMC
depends on MMC_SDHCI
depends on MMC_SDHCI
help
help
Enables support for SDHCI 2.0 controller present on some Qualcomm
Enables support for SDHCI 2.0 controller present on some Qualcomm
@ -303,7 +283,7 @@ config MMC_SDHCI_PIC32
config MMC_SDHCI_ROCKCHIP
config MMC_SDHCI_ROCKCHIP
bool "Arasan SDHCI controller for Rockchip support"
bool "Arasan SDHCI controller for Rockchip support"
depends on ARCH_ROCKCHIP
depends on ARCH_ROCKCHIP
depends on DM_MMC && BLK && DM_MMC_OPS
depends on DM_MMC && BLK
depends on MMC_SDHCI
depends on MMC_SDHCI
help
help
Support for Arasan SDHCI host controller on Rockchip ARM SoCs platform
Support for Arasan SDHCI host controller on Rockchip ARM SoCs platform
@ -376,7 +356,7 @@ config MMC_SDHCI_TEGRA
config MMC_SDHCI_ZYNQ
config MMC_SDHCI_ZYNQ
bool "Arasan SDHCI controller support"
bool "Arasan SDHCI controller support"
depends on ARCH_ZYNQ || ARCH_ZYNQMP
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
depends on MMC_SDHCI
help
help
Support for Arasan SDHCI host controller on Zynq/ZynqMP ARM SoCs platform
Support for Arasan SDHCI host controller on Zynq/ZynqMP ARM SoCs platform
@ -391,7 +371,7 @@ config MMC_SUNXI
config GENERIC_ATMEL_MCI
config GENERIC_ATMEL_MCI
bool "Atmel Multimedia Card Interface support"
bool "Atmel Multimedia Card Interface support"
depends on DM_MMC && BLK && DM_MMC_OPS && ARCH_AT91
depends on DM_MMC && BLK && ARCH_AT91
help
help
This enables support for Atmel High Speed Multimedia Card Interface
This enables support for Atmel High Speed Multimedia Card Interface
(HSMCI), which supports the MultiMedia Card (MMC) Specification V4.3,
(HSMCI), which supports the MultiMedia Card (MMC) Specification V4.3,