Skip to content

Commit 5987e6d

Browse files
ehristevUlf Hansson
authored andcommitted
mmc: sdhci-of-at91: fix set_uhs_signaling rewriting of MC1R
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: d091876 ("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>
1 parent e427266 commit 5987e6d

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

drivers/mmc/host/sdhci-of-at91.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,13 @@ static void sdhci_at91_set_clock(struct sdhci_host *host, unsigned int clock)
100100
static void sdhci_at91_set_uhs_signaling(struct sdhci_host *host,
101101
unsigned int timing)
102102
{
103-
if (timing == MMC_TIMING_MMC_DDR52)
104-
sdhci_writeb(host, SDMMC_MC1R_DDR, SDMMC_MC1R);
103+
u8 mc1r;
104+
105+
if (timing == MMC_TIMING_MMC_DDR52) {
106+
mc1r = sdhci_readb(host, SDMMC_MC1R);
107+
mc1r |= SDMMC_MC1R_DDR;
108+
sdhci_writeb(host, mc1r, SDMMC_MC1R);
109+
}
105110
sdhci_set_uhs_signaling(host, timing);
106111
}
107112

0 commit comments

Comments
 (0)