mmc: sdhci-msm: Add SoC specific compatibles

Since Qualcomm device-trees already use SoC specific compatibles for
describing the 'sdhci-msm' nodes, it makes sense to add the support for the
same in the driver as well.

Keep the old deprecated compatible strings still in the driver, to ensure
backward compatibility with older device-trees.

Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org>
Link: https://lore.kernel.org/r/20220429220833.873672-3-bhupesh.sharma@linaro.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
index 50c71e0ba5e4e8672d05e87103ad3b58d5272153..2de8d115a37a084732235934e285716b3a4191cb 100644 (file)
--- a/drivers/mmc/host/sdhci-msm.c
+++ b/drivers/mmc/host/sdhci-msm.c
@@ -2434,8 +2434,31 @@ static const struct sdhci_msm_variant_info sdm845_sdhci_var = {
 };
 
 static const struct of_device_id sdhci_msm_dt_match[] = {
+        /* Following two entries are deprecated (kept only for backward compatibility) */
        {.compatible = "qcom,sdhci-msm-v4", .data = &sdhci_msm_mci_var},
        {.compatible = "qcom,sdhci-msm-v5", .data = &sdhci_msm_v5_var},
+       /* Add entries for sdcc versions less than 5.0 here */
+       {.compatible = "qcom,apq8084-sdhci", .data = &sdhci_msm_mci_var},
+       {.compatible = "qcom,msm8226-sdhci", .data = &sdhci_msm_mci_var},
+       {.compatible = "qcom,msm8916-sdhci", .data = &sdhci_msm_mci_var},
+       {.compatible = "qcom,msm8953-sdhci", .data = &sdhci_msm_mci_var},
+       {.compatible = "qcom,msm8974-sdhci", .data = &sdhci_msm_mci_var},
+       {.compatible = "qcom,msm8992-sdhci", .data = &sdhci_msm_mci_var},
+       {.compatible = "qcom,msm8994-sdhci", .data = &sdhci_msm_mci_var},
+       {.compatible = "qcom,msm8996-sdhci", .data = &sdhci_msm_mci_var},
+       /*
+        * Add entries for sdcc version 5.0 here. For SDCC version 5.0.0,
+        * MCI registers are removed from SDCC interface and some registers
+        * are moved to HC.
+        */
+       {.compatible = "qcom,qcs404-sdhci", .data = &sdhci_msm_v5_var},
+       {.compatible = "qcom,sdx55-sdhci",  .data = &sdhci_msm_v5_var},
+       {.compatible = "qcom,sdm630-sdhci", .data = &sdhci_msm_v5_var},
+       {.compatible = "qcom,sm6125-sdhci", .data = &sdhci_msm_v5_var},
+       {.compatible = "qcom,sm6350-sdhci", .data = &sdhci_msm_v5_var},
+       {.compatible = "qcom,sm8250-sdhci", .data = &sdhci_msm_v5_var},
+       {.compatible = "qcom,sc7280-sdhci", .data = &sdhci_msm_v5_var},
+       /* Add entries where soc specific handling is required, here */
        {.compatible = "qcom,sdm845-sdhci", .data = &sdm845_sdhci_var},
        {.compatible = "qcom,sc7180-sdhci", .data = &sdm845_sdhci_var},
        {},