summaryrefslogtreecommitdiff
path: root/drivers/mmc
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2025-06-09 16:28:28 -0600
committerTom Rini <[email protected]>2025-06-09 16:28:28 -0600
commit59d00e20fced23e6463aa09db889dd548baee677 (patch)
tree2502afc87e22058b3efd0a5c3d878e62ba52e96e /drivers/mmc
parent865130b7308453b9436942f01cc4481124b820eb (diff)
parentd7c449c3d83a986d61e38d1762433c0607caf5c5 (diff)
Merge tag 'v2025.07-rc4' into next
Prepare v2025.07-rc4
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/am654_sdhci.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/mmc/am654_sdhci.c b/drivers/mmc/am654_sdhci.c
index 0df3568f073..d3c8f94dd0c 100644
--- a/drivers/mmc/am654_sdhci.c
+++ b/drivers/mmc/am654_sdhci.c
@@ -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 = {