firmware: qcom_scm: Drop useless compatibles
authorKonrad Dybcio <konrad.dybcio@linaro.org>
Sat, 24 Jun 2023 12:23:47 +0000 (14:23 +0200)
committerBjorn Andersson <andersson@kernel.org>
Mon, 24 Jul 2023 02:35:02 +0000 (19:35 -0700)
There are three categories of compatibles within the driver:

1. Ones which were introduced without a qcom,scm fallback
2. Ones which were introduced with a qcom,scm fallback
3. Ones which were defined but never used

Keep 1 for backwards compatibility and axe 2 & 3.

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20230623-topic-scm_cleanup-v2-3-9db8c583138d@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
drivers/firmware/qcom_scm.c

index b8398002205d0572ccca3d727626760cc21e8495..b6055b1c18d837b169a5638995badb59c571ee10 100644 (file)
@@ -1478,20 +1478,15 @@ static void qcom_scm_shutdown(struct platform_device *pdev)
 }
 
 static const struct of_device_id qcom_scm_dt_match[] = {
+       { .compatible = "qcom,scm" },
+
+       /* Legacy entries kept for backwards compatibility */
        { .compatible = "qcom,scm-apq8064" },
        { .compatible = "qcom,scm-apq8084" },
        { .compatible = "qcom,scm-ipq4019" },
-       { .compatible = "qcom,scm-mdm9607" },
-       { .compatible = "qcom,scm-msm8660" },
-       { .compatible = "qcom,scm-msm8960" },
-       { .compatible = "qcom,scm-msm8916" },
        { .compatible = "qcom,scm-msm8953" },
        { .compatible = "qcom,scm-msm8974" },
-       { .compatible = "qcom,scm-msm8976" },
-       { .compatible = "qcom,scm-msm8994" },
        { .compatible = "qcom,scm-msm8996" },
-       { .compatible = "qcom,scm-sm6375" },
-       { .compatible = "qcom,scm" },
        {}
 };
 MODULE_DEVICE_TABLE(of, qcom_scm_dt_match);