A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-26 06:33:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

mmc: sdhci-msm: Move MMC_CAP2_MAX_DISCARD_SIZE to prevent merge conflict

Browse source 
Change-Id: I80acdb4f52811ebd371317acfc4afa41e4960656
This commit is contained in:
Michael Bestas 2025-03-19 09:16:15 +02:00
commit 8e590ea149
No known key found for this signature in database
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/mmc/host/sdhci-msm.c
View file

@ -4555,12 +4555,13 @@ static int sdhci_msm_probe(struct platform_device *pdev)
}
sdhci_msm_set_caps(msm_host);
msm_host->mmc->caps2 |= MMC_CAP2_MAX_DISCARD_SIZE;
#if defined(CONFIG_SDC_QTI)
host->timeout_clk_div = 4;
msm_host->mmc->caps2 |= MMC_CAP2_CLK_SCALE;
#endif
msm_host->mmc->caps2 |= MMC_CAP2_MAX_DISCARD_SIZE;
sdhci_msm_setup_pm(pdev, msm_host);
host->mmc_host_ops.execute_tuning = sdhci_msm_execute_tuning;