Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61d15c3a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: sdhci-msm: add USE_CORE_PM capability"

parents d440a67a 5fb6c04a

drivers/mmc/host/sdhci-msm.c

+2 −1
Original line number Diff line number Diff line
@@ -3101,6 +3101,7 @@ static int sdhci_msm_probe(struct platform_device *pdev) 
	msm_host->mmc->caps2 |= MMC_CAP2_STOP_REQUEST;

	msm_host->mmc->caps2 |= MMC_CAP2_ASYNC_SDIO_IRQ_4BIT_MODE;

	msm_host->mmc->pm_caps |= MMC_PM_KEEP_POWER | MMC_PM_WAKE_SDIO_IRQ;

	msm_host->mmc->caps2 |= MMC_CAP2_CORE_PM;



	if (msm_host->pdata->nonremovable)

		msm_host->mmc->caps |= MMC_CAP_NONREMOVABLE;
@@ -3181,7 +3182,7 @@ static int sdhci_msm_probe(struct platform_device *pdev) 
	if (ret)

		pr_err("%s: %s: pm_runtime_set_active failed: err: %d\n",

		       mmc_hostname(host->mmc), __func__, ret);

	else

	else if (mmc_use_core_runtime_pm(host->mmc))

		pm_runtime_enable(&pdev->dev);



	msm_host->auto_cmd21_attr.show = show_auto_cmd21;