Commit 05b880b1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents a4f586a9 723ef0e2

drivers/mmc/host/atmel-mci.c

+3 −1
Original line number Diff line number Diff line
@@ -2499,8 +2499,10 @@ static int atmci_probe(struct platform_device *pdev) 
	/* Get MCI capabilities and set operations according to it */

	atmci_get_cap(host);

	ret = atmci_configure_dma(host);

	if (ret == -EPROBE_DEFER)

	if (ret == -EPROBE_DEFER) {

		clk_disable_unprepare(host->mck);

		goto err_dma_probe_defer;

	}

	if (ret == 0) {

		host->prepare_data = &atmci_prepare_data_dma;

		host->submit_data = &atmci_submit_data_dma;

drivers/mmc/host/sdhci-brcmstb.c

+10 −0
Original line number Diff line number Diff line
@@ -503,8 +503,15 @@ static int sdhci_brcmstb_suspend(struct device *dev) 
	struct sdhci_host *host = dev_get_drvdata(dev);

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct sdhci_brcmstb_priv *priv = sdhci_pltfm_priv(pltfm_host);

	int ret;



	clk_disable_unprepare(priv->base_clk);

	if (host->mmc->caps2 & MMC_CAP2_CQE) {

		ret = cqhci_suspend(host->mmc);

		if (ret)

			return ret;

	}



	return sdhci_pltfm_suspend(dev);

}
@@ -529,6 +536,9 @@ static int sdhci_brcmstb_resume(struct device *dev) 
			ret = clk_set_rate(priv->base_clk, priv->base_freq_hz);

	}



	if (host->mmc->caps2 & MMC_CAP2_CQE)

		ret = cqhci_resume(host->mmc);



	return ret;

}

#endif