mmc: Kconfig: Really correct dependencies SDHCI ADMA options

When doing the investigation for commit 53bb8fdea12a ("mmc: Kconfig:
Correct dependencies SDHCI ADMA options") I missed the implications of
MMC_SDHCI_ADMA_HELPERS. The problem is that FSL_ESDHC via the
FSL_ESDHC_SUPPORT_ADMA2 option will also enable these helper functions.
This in turn means the correct dependency here is
MMC_SDHCI_ADMA_HELPERS and not *MMC_SDHCI_ADMA.

Reported-by: Heiko Thiery <heiko.thiery@gmail.com>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 38867f3..1c9b689 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -528,7 +528,7 @@ config SPL_MMC_SDHCI_ADMA
 
 config MMC_SDHCI_ADMA_FORCE_32BIT
        bool "Force 32 bit mode for ADMA on 64 bit platforms"
-       depends on MMC_SDHCI_ADMA || SPL_MMC_SDHCI_ADMA
+       depends on MMC_SDHCI_ADMA_HELPERS
        help
          This forces SDHCI ADMA to be built for 32 bit descriptors, even
          on a 64 bit platform where they would otherwise be assumed to
@@ -538,7 +538,7 @@ config MMC_SDHCI_ADMA_FORCE_32BIT
 
 config MMC_SDHCI_ADMA_64BIT
        bool "Use SHDCI ADMA with 64 bit descriptors"
-       depends on MMC_SDHCI_ADMA || SPL_MMC_SDHCI_ADMA
+       depends on MMC_SDHCI_ADMA_HELPERS
        depends on !MMC_SDHCI_ADMA_FORCE_32BIT
        default y if DMA_ADDR_T_64BIT
        help