mmc: sdhci-msm: drop redundant of_device_id entries

This reverts three commits:
1. Revert "mmc: sdhci-msm: Add compatible string check for sdx65"
   This reverts commit 953706844f0f2fd4dc6984cc010fe6cf51c041f2.

2. Revert "mmc: sdhci-msm: Add compatible string check for sm8150"
   This reverts commit 5acd6adb65802cc6f9986be3750179a820580d37.

3. Revert "mmc: sdhci-msm: Add SoC specific compatibles"
   This reverts commit 466614a9765c6fb67e1464d0a3f1261db903834b.

The oldest commit 466614a9765c ("mmc: sdhci-msm: Add SoC specific
compatibles") did not specify what benefits such multiple compatibles
bring, therefore assume there is none.  On the other hand such approach
brings a lot of churn to driver maintenance by expecting commit for
every new compatible, even though it is already covered by the fallback.

There is really no sense in duplicating of_device_id for each
variant, which is already covered by generic compatible fallback
qcom,sdhci-msm-v4 or qcom,sdhci-msm-v5.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20220714091042.22287-4-krzysztof.kozlowski@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 e395411fb6fdc442946fab0026ce0a3ccba61407..dc2991422a87331e4a4142551139d1754bca9591 100644 (file)
--- a/drivers/mmc/host/sdhci-msm.c
+++ b/drivers/mmc/host/sdhci-msm.c
@@ -2435,33 +2435,12 @@ 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.
+        * Do not add new variants to the driver which are compatible with
+        * generic ones, unless they need customization.
         */
-       {.compatible = "qcom,qcs404-sdhci", .data = &sdhci_msm_v5_var},
-       {.compatible = "qcom,sdx55-sdhci",  .data = &sdhci_msm_v5_var},
-       {.compatible = "qcom,sdx65-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,sm8150-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,sdhci-msm-v4", .data = &sdhci_msm_mci_var},
+       {.compatible = "qcom,sdhci-msm-v5", .data = &sdhci_msm_v5_var},
        {.compatible = "qcom,sdm845-sdhci", .data = &sdm845_sdhci_var},
        {.compatible = "qcom,sc7180-sdhci", .data = &sdm845_sdhci_var},
        {},