Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mmc: sdhci-msm: detect if tassadar_dll is used by using core version

Detect if tassadar_dll is required by using core version rather than
just specifying it in the sdhci_msm_variant_info.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Cc: Veerabhadrarao Badiganti <vbadigan@codeaurora.org>
Reviewed-by: Veerabhadrarao Badiganti <vbadigan@codeaurora.org>
Link: https://lore.kernel.org/r/20201112173636.360186-1-dmitry.baryshkov@linaro.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

authored by

Dmitry Baryshkov and committed by
Ulf Hansson
8ffbfe43 bbba85fa

+3 -10
+3 -10
drivers/mmc/host/sdhci-msm.c
··· 248 248 struct sdhci_msm_variant_info { 249 249 bool mci_removed; 250 250 bool restore_dll_config; 251 - bool uses_tassadar_dll; 252 251 const struct sdhci_msm_variant_ops *var_ops; 253 252 const struct sdhci_msm_offset *offset; 254 253 }; ··· 2153 2154 .offset = &sdhci_msm_v5_offset, 2154 2155 }; 2155 2156 2156 - static const struct sdhci_msm_variant_info sm8250_sdhci_var = { 2157 - .mci_removed = true, 2158 - .uses_tassadar_dll = true, 2159 - .var_ops = &v5_var_ops, 2160 - .offset = &sdhci_msm_v5_offset, 2161 - }; 2162 - 2163 2157 static const struct of_device_id sdhci_msm_dt_match[] = { 2164 2158 {.compatible = "qcom,sdhci-msm-v4", .data = &sdhci_msm_mci_var}, 2165 2159 {.compatible = "qcom,sdhci-msm-v5", .data = &sdhci_msm_v5_var}, 2166 2160 {.compatible = "qcom,sdm845-sdhci", .data = &sdm845_sdhci_var}, 2167 - {.compatible = "qcom,sm8250-sdhci", .data = &sm8250_sdhci_var}, 2168 2161 {.compatible = "qcom,sc7180-sdhci", .data = &sdm845_sdhci_var}, 2169 2162 {}, 2170 2163 }; ··· 2240 2249 msm_host->restore_dll_config = var_info->restore_dll_config; 2241 2250 msm_host->var_ops = var_info->var_ops; 2242 2251 msm_host->offset = var_info->offset; 2243 - msm_host->uses_tassadar_dll = var_info->uses_tassadar_dll; 2244 2252 2245 2253 msm_offset = msm_host->offset; 2246 2254 ··· 2385 2395 2386 2396 if (core_major == 1 && core_minor >= 0x49) 2387 2397 msm_host->updated_ddr_cfg = true; 2398 + 2399 + if (core_major == 1 && core_minor >= 0x71) 2400 + msm_host->uses_tassadar_dll = true; 2388 2401 2389 2402 ret = sdhci_msm_register_vreg(msm_host); 2390 2403 if (ret)