Skip to content

Commit 466614a

Browse files
bhupesh-sharmaUlf Hansson
authored andcommitted
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>
1 parent a455377 commit 466614a

1 file changed

Lines changed: 23 additions & 0 deletions

File tree

drivers/mmc/host/sdhci-msm.c

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2434,8 +2434,31 @@ static const struct sdhci_msm_variant_info sdm845_sdhci_var = {
24342434
};
24352435

24362436
static const struct of_device_id sdhci_msm_dt_match[] = {
2437+
/* Following two entries are deprecated (kept only for backward compatibility) */
24372438
{.compatible = "qcom,sdhci-msm-v4", .data = &sdhci_msm_mci_var},
24382439
{.compatible = "qcom,sdhci-msm-v5", .data = &sdhci_msm_v5_var},
2440+
/* Add entries for sdcc versions less than 5.0 here */
2441+
{.compatible = "qcom,apq8084-sdhci", .data = &sdhci_msm_mci_var},
2442+
{.compatible = "qcom,msm8226-sdhci", .data = &sdhci_msm_mci_var},
2443+
{.compatible = "qcom,msm8916-sdhci", .data = &sdhci_msm_mci_var},
2444+
{.compatible = "qcom,msm8953-sdhci", .data = &sdhci_msm_mci_var},
2445+
{.compatible = "qcom,msm8974-sdhci", .data = &sdhci_msm_mci_var},
2446+
{.compatible = "qcom,msm8992-sdhci", .data = &sdhci_msm_mci_var},
2447+
{.compatible = "qcom,msm8994-sdhci", .data = &sdhci_msm_mci_var},
2448+
{.compatible = "qcom,msm8996-sdhci", .data = &sdhci_msm_mci_var},
2449+
/*
2450+
* Add entries for sdcc version 5.0 here. For SDCC version 5.0.0,
2451+
* MCI registers are removed from SDCC interface and some registers
2452+
* are moved to HC.
2453+
*/
2454+
{.compatible = "qcom,qcs404-sdhci", .data = &sdhci_msm_v5_var},
2455+
{.compatible = "qcom,sdx55-sdhci", .data = &sdhci_msm_v5_var},
2456+
{.compatible = "qcom,sdm630-sdhci", .data = &sdhci_msm_v5_var},
2457+
{.compatible = "qcom,sm6125-sdhci", .data = &sdhci_msm_v5_var},
2458+
{.compatible = "qcom,sm6350-sdhci", .data = &sdhci_msm_v5_var},
2459+
{.compatible = "qcom,sm8250-sdhci", .data = &sdhci_msm_v5_var},
2460+
{.compatible = "qcom,sc7280-sdhci", .data = &sdhci_msm_v5_var},
2461+
/* Add entries where soc specific handling is required, here */
24392462
{.compatible = "qcom,sdm845-sdhci", .data = &sdm845_sdhci_var},
24402463
{.compatible = "qcom,sc7180-sdhci", .data = &sdm845_sdhci_var},
24412464
{},

0 commit comments

Comments
 (0)