Skip to contentSkip to conversation

mmc: am654_sdhci: Clear UHS_MODE_SELECT when <= MMC_HS_52

PATCH In review Judith Mendez 2 participants 2 messages May 22, 2025 – Jun 5, 2025 MMC, SD and SDIO

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 mmc: am654_sdhci: Clear UHS_MODE_SELECT when <= MMC_HS_52

This clears UHS_MODE_SELECT for timing modes <= MMC_HS_52.

When initializing to HS400 mode, the host controller downgrades to non-uhs modes so clear UHS_MODE_SELECT at modes <= MMC_HS_52.

This fixes eMMC writes on j7200 EVM.

Fixes 6067aa66b3bb ("mmc: am654_sdhci: Add am654_sdhci_set_control_reg")

---
Changes since v1:
- Add Pengs review tag
- Fix commit description '<' -> '<='

---
 drivers/mmc/am654_sdhci.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/mmc/am654_sdhci.c +5 -0
index 0df3568f073..d3c8f94dd0c 100644
@@ -527,11 +527,16 @@ static int am654_sdhci_execute_tuning(struct mmc *mmc, u8 opcode)
 void am654_sdhci_set_control_reg(struct sdhci_host *host)
 {
 	struct mmc *mmc = host->mmc;
+	u32 reg;
 
+	reg = sdhci_readw(host, SDHCI_HOST_CONTROL2);
+	reg &= ~SDHCI_CTRL_UHS_MASK;
 	sdhci_set_voltage(host);
 
 	if (mmc->selected_mode > MMC_HS_52)
 		sdhci_set_uhs_timing(host);
+	else
+		sdhci_writew(host, reg, SDHCI_HOST_CONTROL2);
 }
 
 const struct sdhci_ops am654_sdhci_ops = {
Signature · 1 line
2.49.0
#1 lore raw
Quoted 8 lines · Judith Mendez

This clears UHS_MODE_SELECT for timing modes <= MMC_HS_52.

When initializing to HS400 mode, the host controller downgrades to non-uhs modes so clear UHS_MODE_SELECT at modes <= MMC_HS_52.

This fixes eMMC writes on j7200 EVM.

[...]

Applied to u-boot/master, thanks!

[1/1] mmc: am654_sdhci: Clear UHS_MODE_SELECT when <= MMC_HS_52

      commit: 2782ce5fce883554c968b8852a5ecfde0f2b9a95
Signature · 1 line
Tom