From: Masahiro Yamada Date: Fri, 29 Dec 2017 17:00:08 +0000 (+0900) Subject: mmc: sdhci: do not overwrite host_caps in sdhci_setup_cfg() X-Git-Tag: v2018.03-rc1~99^2~11 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=be165fbbf18ad3926337fe51a337dca730fa7278;p=oweals%2Fu-boot.git mmc: sdhci: do not overwrite host_caps in sdhci_setup_cfg() This line overwrites host_cap that has been set by drivers and/or helpers like mmc_of_parse(). Accumulate capabilities flags. Signed-off-by: Masahiro Yamada --- diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index e2ddf5dccd..243e0e50f5 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -594,7 +594,7 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host, if (host->quirks & SDHCI_QUIRK_BROKEN_VOLTAGE) cfg->voltages |= host->voltages; - cfg->host_caps = MMC_MODE_HS | MMC_MODE_HS_52MHz | MMC_MODE_4BIT; + cfg->host_caps |= MMC_MODE_HS | MMC_MODE_HS_52MHz | MMC_MODE_4BIT; /* Since Host Controller Version3.0 */ if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) {