Commit 30d60844 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: Merge branch fixes into next 



Merge the mmc fixes for v6.4-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.5.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents c7eed31e e6f9e590

drivers/mmc/host/sdhci-msm.c

+3 −0
Original line number Diff line number Diff line
@@ -2355,6 +2355,9 @@ static inline void sdhci_msm_get_of_property(struct platform_device *pdev, 
		msm_host->ddr_config = DDR_CONFIG_POR_VAL;



	of_property_read_u32(node, "qcom,dll-config", &msm_host->dll_config);



	if (of_device_is_compatible(node, "qcom,msm8916-sdhci"))

		host->quirks2 |= SDHCI_QUIRK2_BROKEN_64_BIT_DMA;

}



static int sdhci_msm_gcc_reset(struct device *dev, struct sdhci_host *host)