mmc: sdhci-of-at91: fix set_uhs_signaling rewriting of MC1R

[ Upstream commit 1111848f44d4b46f23c36a68ca510efafbd2889d ]

In set_uhs_signaling, the DDR bit is being set by fully writing the MC1R
register.
This can lead to accidental erase of certain bits in this register.
Avoid this by doing a read-modify-write operation.

Fixes: e54596e47384 ("mmc: sdhci-of-at91: fix MMC_DDR_52 timing selection")
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
Tested-by: Karl Olsen <karl@micro-technic.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20220630090926.15061-1-eugen.hristev@microchip.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c
index 881f8138e7de3476d90ba95f4e7fe551f7ea6814..03698d78a40271c4445993986b3ec63be7838f4a 100644 (file)
--- a/drivers/mmc/host/sdhci-of-at91.c
+++ b/drivers/mmc/host/sdhci-of-at91.c
@@ -109,8 +109,13 @@ static void sdhci_at91_set_power(struct sdhci_host *host, unsigned char mode,
 static void sdhci_at91_set_uhs_signaling(struct sdhci_host *host,
                                         unsigned int timing)
 {
-       if (timing == MMC_TIMING_MMC_DDR52)
-               sdhci_writeb(host, SDMMC_MC1R_DDR, SDMMC_MC1R);
+       u8 mc1r;
+
+       if (timing == MMC_TIMING_MMC_DDR52) {
+               mc1r = sdhci_readb(host, SDMMC_MC1R);
+               mc1r |= SDMMC_MC1R_DDR;
+               sdhci_writeb(host, mc1r, SDMMC_MC1R);
+       }
        sdhci_set_uhs_signaling(host, timing);
 }