mailbox: mtk-cmdq: Sort cmdq platform data by compatible name

Sort cmdq platform data according to the number sequence of
compatible names.

Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
Reviewed-by: CK Hu <ck.hu@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>

diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c b/drivers/mailbox/mtk-cmdq-mailbox.c
index 6b1e8df8485e3e747b1b5667abf71b34f2f388cd..472144c0ef40e779d7fcee329239183617b362a2 100644 (file)
--- a/drivers/mailbox/mtk-cmdq-mailbox.c
+++ b/drivers/mailbox/mtk-cmdq-mailbox.c
@@ -705,6 +705,13 @@ static const struct dev_pm_ops cmdq_pm_ops = {
                           cmdq_runtime_resume, NULL)
 };
 
+static const struct gce_plat gce_plat_mt6779 = {
+       .thread_nr = 24,
+       .shift = 3,
+       .control_by_sw = false,
+       .gce_num = 1
+};
+
 static const struct gce_plat gce_plat_mt8173 = {
        .thread_nr = 16,
        .shift = 0,
@@ -719,10 +726,11 @@ static const struct gce_plat gce_plat_mt8183 = {
        .gce_num = 1
 };
 
-static const struct gce_plat gce_plat_mt6779 = {
+static const struct gce_plat gce_plat_mt8186 = {
        .thread_nr = 24,
        .shift = 3,
-       .control_by_sw = false,
+       .control_by_sw = true,
+       .sw_ddr_en = true,
        .gce_num = 1
 };
 
@@ -740,19 +748,11 @@ static const struct gce_plat gce_plat_mt8195 = {
        .gce_num = 2
 };
 
-static const struct gce_plat gce_plat_mt8186 = {
-       .thread_nr = 24,
-       .shift = 3,
-       .control_by_sw = true,
-       .sw_ddr_en = true,
-       .gce_num = 1
-};
-
 static const struct of_device_id cmdq_of_ids[] = {
+       {.compatible = "mediatek,mt6779-gce", .data = (void *)&gce_plat_mt6779},
        {.compatible = "mediatek,mt8173-gce", .data = (void *)&gce_plat_mt8173},
        {.compatible = "mediatek,mt8183-gce", .data = (void *)&gce_plat_mt8183},
        {.compatible = "mediatek,mt8186-gce", .data = (void *)&gce_plat_mt8186},
-       {.compatible = "mediatek,mt6779-gce", .data = (void *)&gce_plat_mt6779},
        {.compatible = "mediatek,mt8192-gce", .data = (void *)&gce_plat_mt8192},
        {.compatible = "mediatek,mt8195-gce", .data = (void *)&gce_plat_mt8195},
        {}