Skip to content

Commit e172258

Browse files
krzkJassiBrar
authored andcommitted
mailbox: qcom-apcs-ipc: do not grow the of_device_id
Re-organize the compatible devices and add a comment to avoid unneeded of_device_id growth with every new SoC. These devices have quite a lot of similarities and they can use only one compatible fallback for driver binding. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
1 parent 34d8775 commit e172258

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

drivers/mailbox/qcom-apcs-ipc-mailbox.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,7 @@ static int qcom_apcs_ipc_remove(struct platform_device *pdev)
141141

142142
/* .data is the offset of the ipc register within the global block */
143143
static const struct of_device_id qcom_apcs_ipc_of_match[] = {
144-
{ .compatible = "qcom,ipq5332-apcs-apps-global", .data = &ipq6018_apcs_data },
145144
{ .compatible = "qcom,ipq6018-apcs-apps-global", .data = &ipq6018_apcs_data },
146-
{ .compatible = "qcom,ipq8074-apcs-apps-global", .data = &ipq6018_apcs_data },
147145
{ .compatible = "qcom,msm8916-apcs-kpss-global", .data = &msm8916_apcs_data },
148146
{ .compatible = "qcom,msm8939-apcs-kpss-global", .data = &msm8916_apcs_data },
149147
{ .compatible = "qcom,msm8953-apcs-kpss-global", .data = &msm8994_apcs_data },
@@ -153,15 +151,18 @@ static const struct of_device_id qcom_apcs_ipc_of_match[] = {
153151
{ .compatible = "qcom,msm8998-apcs-hmss-global", .data = &msm8994_apcs_data },
154152
{ .compatible = "qcom,qcm2290-apcs-hmss-global", .data = &msm8994_apcs_data },
155153
{ .compatible = "qcom,qcs404-apcs-apps-global", .data = &msm8916_apcs_data },
156-
{ .compatible = "qcom,sc7180-apss-shared", .data = &apps_shared_apcs_data },
157-
{ .compatible = "qcom,sc8180x-apss-shared", .data = &apps_shared_apcs_data },
158154
{ .compatible = "qcom,sdm660-apcs-hmss-global", .data = &msm8994_apcs_data },
159155
{ .compatible = "qcom,sdm845-apss-shared", .data = &apps_shared_apcs_data },
160156
{ .compatible = "qcom,sm4250-apcs-hmss-global", .data = &msm8994_apcs_data },
161157
{ .compatible = "qcom,sm6125-apcs-hmss-global", .data = &msm8994_apcs_data },
162-
{ .compatible = "qcom,sm8150-apss-shared", .data = &apps_shared_apcs_data },
163158
{ .compatible = "qcom,sm6115-apcs-hmss-global", .data = &msm8994_apcs_data },
164159
{ .compatible = "qcom,sdx55-apcs-gcc", .data = &sdx55_apcs_data },
160+
/* Do not add any more entries using existing driver data */
161+
{ .compatible = "qcom,ipq5332-apcs-apps-global", .data = &ipq6018_apcs_data },
162+
{ .compatible = "qcom,ipq8074-apcs-apps-global", .data = &ipq6018_apcs_data },
163+
{ .compatible = "qcom,sc7180-apss-shared", .data = &apps_shared_apcs_data },
164+
{ .compatible = "qcom,sc8180x-apss-shared", .data = &apps_shared_apcs_data },
165+
{ .compatible = "qcom,sm8150-apss-shared", .data = &apps_shared_apcs_data },
165166
{}
166167
};
167168
MODULE_DEVICE_TABLE(of, qcom_apcs_ipc_of_match);

0 commit comments

Comments
 (0)