Merge git://git.denx.de/u-boot-tegra

[u-boot] / drivers / mmc / Kconfig

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 0aef13215e770f6fa12e6df4c95c0ebe85a55131..560391fae249d16c42e8642feeea6165fe6ef381 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -10,6 +10,10 @@ config MMC
          If you want MMC/SD/SDIO support, you should say Y here and
          also to your specific host controller driver.
 
          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
 config DM_MMC
        bool "Enable MMC controllers using Driver Model"
        depends on DM


@@ -47,27 +51,6 @@ config SPL_MMC_TINY
          operations too, which can remove the need for malloc support in SPL
          and thus further reduce footprint.
 
          operations too, which can remove the need for malloc support in SPL
          and thus further reduce footprint.
 

-config MSM_SDHCI
-       bool "Qualcomm SDHCI controller"
-       depends on DM_MMC && BLK && DM_MMC_OPS
-       depends on MMC_SDHCI
-       help
-         Enables support for SDHCI 2.0 controller present on some Qualcomm
-          Snapdragon devices. This device is compatible with eMMC v4.5 and
-          SD 3.0 specifications. Both SD and eMMC devices are supported.
-         Card-detect gpios are not supported.
-
-config ATMEL_SDHCI
-       bool "Atmel SDHCI controller support"
-       depends on DM_MMC && BLK && DM_MMC_OPS && ARCH_AT91
-       depends on MMC_SDHCI
-       help
-         This enables support for the Atmel SDHCI controller, which supports
-         the embedded MultiMedia Card (e.MMC) Specification V4.51, the SD
-         Memory Card Specification V3.0, and the SDIO V3.0 specification.
-         It is compliant with the SD Host Controller Standard V3.0
-         specification.
-

 config MMC_DAVINCI
        bool "TI DAVINCI Multimedia Card Interface support"
        depends on ARCH_DAVINCI
 config MMC_DAVINCI
        bool "TI DAVINCI Multimedia Card Interface support"
        depends on ARCH_DAVINCI


@@ -139,6 +122,14 @@ config MMC_MXS
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+config MMC_PCI
+       bool "Support for MMC controllers on PCI"
+       help
+         This selects PCI-based MMC controllers.
+         If you have an MMC controller on a PCI bus, say Y here.
+
+         If unsure, say N.
+

 config MMC_OMAP_HS
        bool "TI OMAP High Speed Multimedia Card Interface support"
        help
 config MMC_OMAP_HS
        bool "TI OMAP High Speed Multimedia Card Interface support"
        help


@@ -148,32 +139,23 @@ config MMC_OMAP_HS
 
          If unsure, say N.
 
 
          If unsure, say N.
 

-config SH_SDHI
-       bool "SuperH/Renesas ARM SoCs on-chip SDHI host controller support"
-       depends on RMOBILE
+config MMC_OMAP36XX_PINS
+       bool "Enable MMC1 on OMAP36xx/37xx"
+       depends on OMAP34XX && MMC_OMAP_HS

        help
        help

-         Support for the on-chip SDHI host controller on SuperH/Renesas ARM SoCs platform
+         This enables extended-drain in the MMC/SD/SDIO1I/O and
+         GPIO-associated I/O cells (gpio_126, gpio_127, and gpio_129)
+         specific to the OMAP36xx/37xx using MMC1

 
 

-config PIC32_SDHCI
-       bool "Microchip PIC32 on-chip SDHCI support"
-       depends on DM_MMC && MACH_PIC32
-       depends on MMC_SDHCI
-       help
-         Support for Microchip PIC32 SDHCI controller.
+         If you have a controller with this interface, say Y here.

 
 

-config ZYNQ_SDHCI
-       bool "Arasan SDHCI controller support"
-       depends on DM_MMC && OF_CONTROL && BLK && DM_MMC_OPS
-       depends on MMC_SDHCI
-       help
-         Support for Arasan SDHCI host controller on Zynq/ZynqMP ARM SoCs platform
+         If unsure, say N.

 
 

-config ROCKCHIP_SDHCI
-       bool "Arasan SDHCI controller for Rockchip support"
-       depends on DM_MMC && BLK && DM_MMC_OPS
-       depends on MMC_SDHCI
+config SH_SDHI
+       bool "SuperH/Renesas ARM SoCs on-chip SDHI host controller support"
+       depends on RMOBILE

        help
        help

-         Support for Arasan SDHCI host controller on Rockchip ARM SoCs platform
+         Support for the on-chip SDHI host controller on SuperH/Renesas ARM SoCs platform

 
 config MMC_UNIPHIER
        bool "UniPhier SD/MMC Host Controller support"
 
 config MMC_UNIPHIER
        bool "UniPhier SD/MMC Host Controller support"


@@ -183,9 +165,10 @@ config MMC_UNIPHIER
        help
          This selects support for the SD/MMC Host Controller on UniPhier SoCs.
 
        help
          This selects support for the SD/MMC Host Controller on UniPhier SoCs.
 

-config SANDBOX_MMC
+config MMC_SANDBOX

        bool "Sandbox MMC support"
        bool "Sandbox MMC support"

-       depends on MMC && SANDBOX
+       depends on SANDBOX
+       depends on BLK && DM_MMC_OPS && 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
        help
          This select a dummy sandbox MMC driver. At present this does nothing
          other than allow sandbox to be build with MMC support. This


@@ -217,6 +200,18 @@ config MMC_SDHCI_SDMA
          This enables support for the SDMA (Single Operation DMA) defined
          in the SD Host Controller Standard Specification Version 1.00 .
 
          This enables support for the SDMA (Single Operation DMA) defined
          in the SD Host Controller Standard Specification Version 1.00 .
 

+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 MMC_SDHCI
+       help
+         This enables support for the Atmel SDHCI controller, which supports
+         the embedded MultiMedia Card (e.MMC) Specification V4.51, the SD
+         Memory Card Specification V3.0, and the SDIO V3.0 specification.
+         It is compliant with the SD Host Controller Standard V3.0
+         specification.
+

 config MMC_SDHCI_BCM2835
        tristate "SDHCI support for the BCM2835 SD/MMC Controller"
        depends on ARCH_BCM283X
 config MMC_SDHCI_BCM2835
        tristate "SDHCI support for the BCM2835 SD/MMC Controller"
        depends on ARCH_BCM283X


@@ -252,6 +247,16 @@ config MMC_SDHCI_KONA
 
          If you have a controller with this interface, say Y here.
 
 
          If you have a controller with this interface, say Y here.
 

+config MMC_SDHCI_MSM
+       bool "Qualcomm SDHCI controller"
+       depends on BLK && DM_MMC_OPS
+       depends on MMC_SDHCI
+       help
+         Enables support for SDHCI 2.0 controller present on some Qualcomm
+          Snapdragon devices. This device is compatible with eMMC v4.5 and
+          SD 3.0 specifications. Both SD and eMMC devices are supported.
+         Card-detect gpios are not supported.
+

 config MMC_SDHCI_MV
        bool "SDHCI support on Marvell platform"
        depends on ARCH_MVEBU
 config MMC_SDHCI_MV
        bool "SDHCI support on Marvell platform"
        depends on ARCH_MVEBU


@@ -264,6 +269,21 @@ config MMC_SDHCI_MV
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+config MMC_SDHCI_PIC32
+       bool "Microchip PIC32 on-chip SDHCI support"
+       depends on DM_MMC && MACH_PIC32
+       depends on MMC_SDHCI
+       help
+         Support for Microchip PIC32 SDHCI controller.
+
+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 MMC_SDHCI
+       help
+         Support for Arasan SDHCI host controller on Rockchip ARM SoCs platform
+

 config MMC_SDHCI_S5P
        bool "SDHCI support on Samsung S5P SoC"
        depends on MMC_SDHCI
 config MMC_SDHCI_S5P
        bool "SDHCI support on Samsung S5P SoC"
        depends on MMC_SDHCI


@@ -287,6 +307,38 @@ config MMC_SDHCI_SPEAR
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+config MMC_SDHCI_STI
+       bool "SDHCI support for STMicroelectronics SoC"
+       depends on MMC_SDHCI && OF_CONTROL
+       help
+         This selects the Secure Digital Host Controller Interface (SDHCI)
+         on STMicroelectronics STiH410 SoC.
+
+config MMC_SDHCI_XENON
+       bool "SDHCI support for the Xenon SDHCI controller"
+       depends on MMC_SDHCI && DM_MMC && OF_CONTROL
+       help
+         Support for Xenon SDHCI host controller on Marvell Armada 3700
+         7k/8k ARM SoCs platforms
+
+         If you have a controller with this interface, say Y here.
+
+         If unsure, say N.
+
+config MMC_SDHCI_TANGIER
+       bool "Tangier SDHCI controller support"
+       depends on DM_MMC && BLK
+       depends on MMC_SDHCI
+       help
+         This selects support for SDHCI controller on Tanginer
+         SoC. Note that this controller does not sit on PCI bus and,
+         hence, cannot be enumerated by standard PCI means.
+
+         If you're using an Intel Tangier SoC (available on Intel
+         Edison board), say Y here.
+
+         If unsure, say N.
+

 config MMC_SDHCI_TEGRA
        bool "SDHCI platform support for the Tegra SD/MMC Controller"
        depends on TEGRA
 config MMC_SDHCI_TEGRA
        bool "SDHCI platform support for the Tegra SD/MMC Controller"
        depends on TEGRA


@@ -297,9 +349,17 @@ config MMC_SDHCI_TEGRA
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+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 MMC_SDHCI
+       help
+         Support for Arasan SDHCI host controller on Zynq/ZynqMP ARM SoCs platform
+

 config MMC_SUNXI
        bool "Allwinner sunxi SD/MMC Host Controller support"
 config MMC_SUNXI
        bool "Allwinner sunxi SD/MMC Host Controller support"

-       depends on ARCH_SUNXI
+       depends on ARCH_SUNXI && !UART0_PORT_F

        default y
        help
          This selects support for the SD/MMC Host Controller on
        default y
        help
          This selects support for the SD/MMC Host Controller on


@@ -307,6 +367,17 @@ config MMC_SUNXI
 
 endif
 
 
 endif
 

+config TEGRA124_MMC_DISABLE_EXT_LOOPBACK
+       bool "Disable external clock loopback"
+       depends on MMC_SDHCI_TEGRA && TEGRA124
+       help
+         Disable the external clock loopback and use the internal one on SDMMC3
+         as per the SDMMC_VENDOR_MISC_CNTRL_0 register's SDMMC_SPARE1 bits
+         being set to 0xfffd according to the TRM.
+
+         TODO(marcel.ziswiler@toradex.com): Move to device tree controlled
+         approach once proper kernel integration made it mainline.
+

 endmenu
 
 config SYS_FSL_ERRATUM_ESDHC111
 endmenu
 
 config SYS_FSL_ERRATUM_ESDHC111