[PATCH] mmc: Kconfig: Really correct dependencies SDHCI ADMA options

[Peng Fan]

Hi Tom,

> Subject: [PATCH] mmc: Kconfig: Really correct dependencies SDHCI
> ADMA options

Thanks for fixing this.

> 
> 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 at gmail.com>
> Signed-off-by: Tom Rini <trini at konsulko.com>
> ---
> This is a regression vs v2025.04 and so I want to get this in for this
> release. Should I apply it directly or will there be an MMC PR for it?
> Thanks!

Please pick it up directly.

Thanks,
Peng.
> 
> Cc: Peng Fan <peng.fan at nxp.com>
> Cc: Jaehoon Chung <jh80.chung at samsung.com>
> ---
>  drivers/mmc/Kconfig | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index
> 38867f30a7eb..1c9b6898bff4 100644
> --- 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
> --
> 2.43.0