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

Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
---
 drivers/mailbox/mtk-cmdq-mailbox.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c b/drivers/mailbox/mtk-cmdq-mailbox.c
index 16c504f8d9d5..39bf066d376e 100644
--- a/drivers/mailbox/mtk-cmdq-mailbox.c
+++ b/drivers/mailbox/mtk-cmdq-mailbox.c
@@ -706,6 +706,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,
@@ -720,10 +727,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
 };
 
@@ -741,19 +749,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},
 	{}
-- 
2.18.0

Il 15/12/23 08:00, Jason-JH.Lin ha scritto:
> 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: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

On Fri, 2023-12-15 at 15:00 +0800, Jason-JH.Lin wrote:
> Sort cmdq platform data according to the number sequence of
> compatible names.

Reviewed-by: CK Hu <ck.hu@mediatek.com>

> 
> Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
> ---
>  drivers/mailbox/mtk-cmdq-mailbox.c | 22 +++++++++++-----------
>  1 file changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c
> b/drivers/mailbox/mtk-cmdq-mailbox.c
> index 16c504f8d9d5..39bf066d376e 100644
> --- a/drivers/mailbox/mtk-cmdq-mailbox.c
> +++ b/drivers/mailbox/mtk-cmdq-mailbox.c
> @@ -706,6 +706,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,
> @@ -720,10 +727,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
>  };
>  
> @@ -741,19 +749,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},
>  	{}