Commit f4dfef81 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: Merge branch fixes into next 



Merge the mmc fixes for v6.14-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.15.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents 3834a759 723ef0e2

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