diff options
| author |   Ulf Hansson <ulf.hansson@linaro.org> | 2025-06-24 14:18:33 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2025-06-24 14:18:33 +0200 |
| commit | 115ed5cb58ee4bab72a3d25dff9a98ff441b684a (patch) | |
| tree | 0fe8043cc9d8b166fe8b7030538e3f9daba13d1b /drivers/mmc | |
| parent | mmc: Merge branch fixes into next (diff) | |
| parent | Revert "mmc: sdhci: Disable SD card clock before changing parameters" (diff) | |
| download | wireguard-linux-115ed5cb58ee4bab72a3d25dff9a98ff441b684a.tar.xz wireguard-linux-115ed5cb58ee4bab72a3d25dff9a98ff441b684a.zip | |
mmc: Merge branch fixes into next
Merge the mmc fixes for v6.16-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.17.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 4c6c2cc93c41..3a17821efa5c 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2065,15 +2065,10 @@ void sdhci_set_clock(struct sdhci_host *host, unsigned int clock) host->mmc->actual_clock = 0; - clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL); - if (clk & SDHCI_CLOCK_CARD_EN) - sdhci_writew(host, clk & ~SDHCI_CLOCK_CARD_EN, - SDHCI_CLOCK_CONTROL); + sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL); - if (clock == 0) { - sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL); + if (clock == 0) return; - } clk = sdhci_calc_clk(host, clock, &host->mmc->actual_clock); sdhci_enable_clk(host, clk); |