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

Commit 01839c0b 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: enable clock scaling capability"

parents 2769291d 9cc95fde

arch/arm/boot/dts/qcom/msm8996.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -1118,6 +1118,8 @@ 
		qcom,bus-width = <8>;

		qcom,cpu-dma-latency-us = <701>;



		qcom,devfreq,freq-table = <52000000 200000000>;



		qcom,msm-bus,name = "sdhc1";

		qcom,msm-bus,num-cases = <9>;

		qcom,msm-bus,num-paths = <1>;
@@ -1153,6 +1155,8 @@ 
		qcom,bus-width = <4>;

		qcom,cpu-dma-latency-us = <701>;



		qcom,devfreq,freq-table = <52000000 200000000>;



		qcom,msm-bus,name = "sdhc2";

		qcom,msm-bus,num-cases = <8>;

		qcom,msm-bus,num-paths = <1>;

drivers/mmc/host/sdhci-msm.c

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

	msm_host->mmc->caps2 |= MMC_CAP2_ASYNC_SDIO_IRQ_4BIT_MODE;

	msm_host->mmc->caps2 |= MMC_CAP2_HS400_POST_TUNING;

	msm_host->mmc->caps2 |= MMC_CAP2_CLK_SCALE;

	msm_host->mmc->pm_caps |= MMC_PM_KEEP_POWER;



	if (msm_host->pdata->nonremovable)