diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2023-06-13 10:41:28 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2023-06-13 10:41:28 +0200 |
| commit | 30d60844a0fd0bb2e0656def5358f9930ca21b95 (patch) | |
| tree | af9feb40e432e59ad19d156535f302e2fc3679c8 /drivers/mmc/host | |
| parent | mmc: sdhci-msm: Switch to the new ICE API (diff) | |
| parent | mmc: sdhci-msm: Disable broken 64-bit DMA on MSM8916 (diff) | |
| download | linux-30d60844a0fd0bb2e0656def5358f9930ca21b95.tar.xz linux-30d60844a0fd0bb2e0656def5358f9930ca21b95.zip | |
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: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host')
| -rw-r--r-- | drivers/mmc/host/sdhci-msm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 98171bf5748c..1c935b5bafe1 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -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) |