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

Commit 375da5fa authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "mmc: core: Disable SD Card UHS-1 Support""

parents 49240595 c4fb8100

drivers/mmc/core/sd.c

+8 −0
Original line number Diff line number Diff line
@@ -816,6 +816,14 @@ int mmc_sd_get_cid(struct mmc_host *host, u32 ocr, u32 *cid, u32 *rocr) 
	if (!err)

		ocr |= SD_OCR_CCS;



	/*

	 * If the host supports one of UHS-I modes, request the card

	 * to switch to 1.8V signaling level. If the card has failed

	 * repeatedly to switch however, skip this.

	 */

	if (retries && mmc_host_uhs(host))

		ocr |= SD_OCR_S18R;



	/*

	 * If the host can supply more than 150mA at current voltage,

	 * XPC should be set to 1.

drivers/mmc/host/sdhci-msm.c

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

	msm_host->mmc->caps2 |= MMC_CAP2_BOOTPART_NOACC;

	msm_host->mmc->caps2 |= MMC_CAP2_HS400_POST_TUNING;

	msm_host->mmc->caps2 |= MMC_CAP2_CLK_SCALE;

	msm_host->mmc->caps2 |= MMC_CAP2_SANITIZE;

	msm_host->mmc->caps2 |= MMC_CAP2_MAX_DISCARD_SIZE;

	msm_host->mmc->caps2 |= MMC_CAP2_SLEEP_AWAKE;