Commit 3a44fb9f authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: Merge branch fixes into next 



Merge the mmc fixes for v5.19rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v5.20.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents c095449e 51189eb9

drivers/mmc/host/sdhci-omap.c

+8 −6
Original line number Diff line number Diff line
@@ -1298,8 +1298,9 @@ static int sdhci_omap_probe(struct platform_device *pdev) 
	/*

	 * omap_device_pm_domain has callbacks to enable the main

	 * functional clock, interface clock and also configure the

	 * SYSCONFIG register of omap devices. The callback will be invoked

	 * as part of pm_runtime_get_sync.

	 * SYSCONFIG register to clear any boot loader set voltage

	 * capabilities before calling sdhci_setup_host(). The

	 * callback will be invoked as part of pm_runtime_get_sync.

	 */

	pm_runtime_use_autosuspend(dev);

	pm_runtime_set_autosuspend_delay(dev, 50);
@@ -1441,6 +1442,7 @@ static int __maybe_unused sdhci_omap_runtime_suspend(struct device *dev) 
	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct sdhci_omap_host *omap_host = sdhci_pltfm_priv(pltfm_host);



	if (omap_host->con != -EINVAL)

		sdhci_runtime_suspend_host(host);



	sdhci_omap_context_save(omap_host);
@@ -1458,10 +1460,10 @@ static int __maybe_unused sdhci_omap_runtime_resume(struct device *dev) 


	pinctrl_pm_select_default_state(dev);



	if (omap_host->con != -EINVAL)

	if (omap_host->con != -EINVAL) {

		sdhci_omap_context_restore(omap_host);



		sdhci_runtime_resume_host(host, 0);

	}



	return 0;

}