mmc: core: Do not evaluate HS400 capabilities if bus has no MMC capability

If 'no-mmc' is set but 'no-mmc-hs400' is not, this warning is raised.
Specifying 'no-mmc' should be enough though.

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Link: https://lore.kernel.org/r/20220614113905.1458715-1-alexander.stein@ew.tq-group.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 2ed2b4d5e5a5be588e2007e12a72070f56c57d25..0fd91f749b3aec6840ea32c985aacd0cfd5de52f 100644 (file)
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -599,7 +599,7 @@ static int mmc_validate_host_caps(struct mmc_host *host)
        }
 
        if (caps2 & (MMC_CAP2_HS400_ES | MMC_CAP2_HS400) &&
-           !(caps & MMC_CAP_8_BIT_DATA)) {
+           !(caps & MMC_CAP_8_BIT_DATA) && !(caps2 & MMC_CAP2_NO_MMC)) {
                dev_warn(dev, "drop HS400 support since no 8-bit bus\n");
                host->caps2 = caps2 & ~MMC_CAP2_HS400_ES & ~MMC_CAP2_HS400;
        }