Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'mmc-v6.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
Pull MMC host fixes from Ulf Hansson:
- sdhci-brcmstb: Fix CQE suspend/resume support
- atmel-mci: Add a missing clk_disable_unprepare() in ->probe()
* tag 'mmc-v6.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
mmc: sdhci-brcmstb: add cqhci suspend/resume to PM ops
mmc: atmel-mci: Add missing clk_disable_unprepare()
+13
-1
+3
-1
drivers/mmc/host/atmel-mci.c
+3
-1
drivers/mmc/host/atmel-mci.c
···
2499
2499
/* Get MCI capabilities and set operations according to it */
2500
2500
atmci_get_cap(host);
2501
2501
ret = atmci_configure_dma(host);
2502
-
if (ret == -EPROBE_DEFER)
2502
+
if (ret == -EPROBE_DEFER) {
2503
+
clk_disable_unprepare(host->mck);
2503
2504
goto err_dma_probe_defer;
2505
+
}
2504
2506
if (ret == 0) {
2505
2507
host->prepare_data = &atmci_prepare_data_dma;
2506
2508
host->submit_data = &atmci_submit_data_dma;
+10
drivers/mmc/host/sdhci-brcmstb.c
+10
drivers/mmc/host/sdhci-brcmstb.c
···
503
503
struct sdhci_host *host = dev_get_drvdata(dev);
504
504
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
505
505
struct sdhci_brcmstb_priv *priv = sdhci_pltfm_priv(pltfm_host);
506
+
int ret;
506
507
507
508
clk_disable_unprepare(priv->base_clk);
509
+
if (host->mmc->caps2 & MMC_CAP2_CQE) {
510
+
ret = cqhci_suspend(host->mmc);
511
+
if (ret)
512
+
return ret;
513
+
}
514
+
508
515
return sdhci_pltfm_suspend(dev);
509
516
}
510
517
···
535
528
(clk_get_rate(priv->base_clk) != priv->base_freq_hz))
536
529
ret = clk_set_rate(priv->base_clk, priv->base_freq_hz);
537
530
}
531
+
532
+
if (host->mmc->caps2 & MMC_CAP2_CQE)
533
+
ret = cqhci_resume(host->mmc);
538
534
539
535
return ret;
540
536
}