Skip to content

Commit b05cd71

Browse files
krzkUlf Hansson
authored andcommitted
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 9537068. 2. Revert "mmc: sdhci-msm: Add compatible string check for sm8150" This reverts commit 5acd6ad. 3. Revert "mmc: sdhci-msm: Add SoC specific compatibles" This reverts commit 466614a. The oldest commit 466614a ("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>
1 parent 9b538b0 commit b05cd71

1 file changed

Lines changed: 4 additions & 25 deletions

File tree

drivers/mmc/host/sdhci-msm.c

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2435,33 +2435,12 @@ static const struct sdhci_msm_variant_info sdm845_sdhci_var = {
24352435
};
24362436

24372437
static const struct of_device_id sdhci_msm_dt_match[] = {
2438-
/* Following two entries are deprecated (kept only for backward compatibility) */
2439-
{.compatible = "qcom,sdhci-msm-v4", .data = &sdhci_msm_mci_var},
2440-
{.compatible = "qcom,sdhci-msm-v5", .data = &sdhci_msm_v5_var},
2441-
/* Add entries for sdcc versions less than 5.0 here */
2442-
{.compatible = "qcom,apq8084-sdhci", .data = &sdhci_msm_mci_var},
2443-
{.compatible = "qcom,msm8226-sdhci", .data = &sdhci_msm_mci_var},
2444-
{.compatible = "qcom,msm8916-sdhci", .data = &sdhci_msm_mci_var},
2445-
{.compatible = "qcom,msm8953-sdhci", .data = &sdhci_msm_mci_var},
2446-
{.compatible = "qcom,msm8974-sdhci", .data = &sdhci_msm_mci_var},
2447-
{.compatible = "qcom,msm8992-sdhci", .data = &sdhci_msm_mci_var},
2448-
{.compatible = "qcom,msm8994-sdhci", .data = &sdhci_msm_mci_var},
2449-
{.compatible = "qcom,msm8996-sdhci", .data = &sdhci_msm_mci_var},
24502438
/*
2451-
* Add entries for sdcc version 5.0 here. For SDCC version 5.0.0,
2452-
* MCI registers are removed from SDCC interface and some registers
2453-
* are moved to HC.
2439+
* Do not add new variants to the driver which are compatible with
2440+
* generic ones, unless they need customization.
24542441
*/
2455-
{.compatible = "qcom,qcs404-sdhci", .data = &sdhci_msm_v5_var},
2456-
{.compatible = "qcom,sdx55-sdhci", .data = &sdhci_msm_v5_var},
2457-
{.compatible = "qcom,sdx65-sdhci", .data = &sdhci_msm_v5_var},
2458-
{.compatible = "qcom,sdm630-sdhci", .data = &sdhci_msm_v5_var},
2459-
{.compatible = "qcom,sm6125-sdhci", .data = &sdhci_msm_v5_var},
2460-
{.compatible = "qcom,sm6350-sdhci", .data = &sdhci_msm_v5_var},
2461-
{.compatible = "qcom,sm8150-sdhci", .data = &sdhci_msm_v5_var},
2462-
{.compatible = "qcom,sm8250-sdhci", .data = &sdhci_msm_v5_var},
2463-
{.compatible = "qcom,sc7280-sdhci", .data = &sdhci_msm_v5_var},
2464-
/* Add entries where soc specific handling is required, here */
2442+
{.compatible = "qcom,sdhci-msm-v4", .data = &sdhci_msm_mci_var},
2443+
{.compatible = "qcom,sdhci-msm-v5", .data = &sdhci_msm_v5_var},
24652444
{.compatible = "qcom,sdm845-sdhci", .data = &sdm845_sdhci_var},
24662445
{.compatible = "qcom,sc7180-sdhci", .data = &sdm845_sdhci_var},
24672446
{},

0 commit comments

Comments
 (0)