mailbox: qcom-apcs-ipc: re-organize compatibles with fallbacks

Similarly to previous commit e17225887005 ("mailbox: qcom-apcs-ipc: do
not grow the of_device_id"), move compatibles with fallbacks in the
of_device_id table, to indicate these are not necessary.  This only
shuffles the code.  No functional impact.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>

diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
index 002a135..79136fb 100644 (file)
--- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c
+++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
@@ -145,19 +145,19 @@ static const struct of_device_id qcom_apcs_ipc_of_match[] = {
        { .compatible = "qcom,msm8916-apcs-kpss-global", .data = &msm8916_apcs_data },
        { .compatible = "qcom,msm8939-apcs-kpss-global", .data = &msm8916_apcs_data },
        { .compatible = "qcom,msm8953-apcs-kpss-global", .data = &msm8994_apcs_data },
-       { .compatible = "qcom,msm8976-apcs-kpss-global", .data = &msm8994_apcs_data },
        { .compatible = "qcom,msm8994-apcs-kpss-global", .data = &msm8994_apcs_data },
        { .compatible = "qcom,msm8996-apcs-hmss-global", .data = &msm8996_apcs_data },
-       { .compatible = "qcom,msm8998-apcs-hmss-global", .data = &msm8994_apcs_data },
        { .compatible = "qcom,qcm2290-apcs-hmss-global", .data = &msm8994_apcs_data },
+       { .compatible = "qcom,sdm845-apss-shared", .data = &apps_shared_apcs_data },
+       { .compatible = "qcom,sdx55-apcs-gcc", .data = &sdx55_apcs_data },
+       /* Do not add any more entries using existing driver data */
+       { .compatible = "qcom,msm8976-apcs-kpss-global", .data = &msm8994_apcs_data },
+       { .compatible = "qcom,msm8998-apcs-hmss-global", .data = &msm8994_apcs_data },
        { .compatible = "qcom,qcs404-apcs-apps-global", .data = &msm8916_apcs_data },
        { .compatible = "qcom,sdm660-apcs-hmss-global", .data = &msm8994_apcs_data },
-       { .compatible = "qcom,sdm845-apss-shared", .data = &apps_shared_apcs_data },
        { .compatible = "qcom,sm4250-apcs-hmss-global", .data = &msm8994_apcs_data },
        { .compatible = "qcom,sm6125-apcs-hmss-global", .data = &msm8994_apcs_data },
        { .compatible = "qcom,sm6115-apcs-hmss-global", .data = &msm8994_apcs_data },
-       { .compatible = "qcom,sdx55-apcs-gcc", .data = &sdx55_apcs_data },
-       /* Do not add any more entries using existing driver data */
        { .compatible = "qcom,ipq5332-apcs-apps-global", .data = &ipq6018_apcs_data },
        { .compatible = "qcom,ipq8074-apcs-apps-global", .data = &ipq6018_apcs_data },
        { .compatible = "qcom,sc7180-apss-shared", .data = &apps_shared_apcs_data },