[PATCH v12 16/23] drm/mediatek: Sort OVL adaptor components

[Hsiao Chien Sung]

Sort OVL adaptor components' names in alphabetical order.

Reviewed-by: CK Hu <ck...@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno 
<angelogioacchino.delre...@collabora.com>
Signed-off-by: Hsiao Chien Sung <shawn.s...@mediatek.com>
---
 drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c 
b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
index 65c5153bdcd8..30f2475d1c0b 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
@@ -27,13 +27,14 @@
 #define MTK_OVL_ADAPTOR_LAYER_NUM 4
 
 enum mtk_ovl_adaptor_comp_type {
-       OVL_ADAPTOR_TYPE_MDP_RDMA = 0,
-       OVL_ADAPTOR_TYPE_MERGE,
        OVL_ADAPTOR_TYPE_ETHDR,
+       OVL_ADAPTOR_TYPE_MDP_RDMA,
+       OVL_ADAPTOR_TYPE_MERGE,
        OVL_ADAPTOR_TYPE_NUM,
 };
 
 enum mtk_ovl_adaptor_comp_id {
+       OVL_ADAPTOR_ETHDR0,
        OVL_ADAPTOR_MDP_RDMA0,
        OVL_ADAPTOR_MDP_RDMA1,
        OVL_ADAPTOR_MDP_RDMA2,
@@ -46,7 +47,6 @@ enum mtk_ovl_adaptor_comp_id {
        OVL_ADAPTOR_MERGE1,
        OVL_ADAPTOR_MERGE2,
        OVL_ADAPTOR_MERGE3,
-       OVL_ADAPTOR_ETHDR0,
        OVL_ADAPTOR_ID_MAX
 };
 
@@ -64,9 +64,9 @@ struct mtk_disp_ovl_adaptor {
 };
 
 static const char * const private_comp_stem[OVL_ADAPTOR_TYPE_NUM] = {
+       [OVL_ADAPTOR_TYPE_ETHDR]        = "ethdr",
        [OVL_ADAPTOR_TYPE_MDP_RDMA]     = "vdo1-rdma",
        [OVL_ADAPTOR_TYPE_MERGE]        = "merge",
-       [OVL_ADAPTOR_TYPE_ETHDR]        = "ethdr",
 };
 
 static const struct mtk_ddp_comp_funcs ethdr = {
@@ -89,6 +89,7 @@ static const struct mtk_ddp_comp_funcs rdma = {
 };
 
 static const struct ovl_adaptor_comp_match comp_matches[OVL_ADAPTOR_ID_MAX] = {
+       [OVL_ADAPTOR_ETHDR0] = { OVL_ADAPTOR_TYPE_ETHDR, 
DDP_COMPONENT_ETHDR_MIXER, 0, &ethdr },
        [OVL_ADAPTOR_MDP_RDMA0] = { OVL_ADAPTOR_TYPE_MDP_RDMA, 
DDP_COMPONENT_MDP_RDMA0, 0, &rdma },
        [OVL_ADAPTOR_MDP_RDMA1] = { OVL_ADAPTOR_TYPE_MDP_RDMA, 
DDP_COMPONENT_MDP_RDMA1, 1, &rdma },
        [OVL_ADAPTOR_MDP_RDMA2] = { OVL_ADAPTOR_TYPE_MDP_RDMA, 
DDP_COMPONENT_MDP_RDMA2, 2, &rdma },
@@ -101,7 +102,6 @@ static const struct ovl_adaptor_comp_match 
comp_matches[OVL_ADAPTOR_ID_MAX] = {
        [OVL_ADAPTOR_MERGE1] = { OVL_ADAPTOR_TYPE_MERGE, DDP_COMPONENT_MERGE2, 
2, &merge },
        [OVL_ADAPTOR_MERGE2] = { OVL_ADAPTOR_TYPE_MERGE, DDP_COMPONENT_MERGE3, 
3, &merge },
        [OVL_ADAPTOR_MERGE3] = { OVL_ADAPTOR_TYPE_MERGE, DDP_COMPONENT_MERGE4, 
4, &merge },
-       [OVL_ADAPTOR_ETHDR0] = { OVL_ADAPTOR_TYPE_ETHDR, 
DDP_COMPONENT_ETHDR_MIXER, 0, &ethdr },
 };
 
 void mtk_ovl_adaptor_layer_config(struct device *dev, unsigned int idx,
@@ -399,6 +399,7 @@ void mtk_ovl_adaptor_remove_comp(struct device *dev, struct 
mtk_mutex *mutex)
 
 void mtk_ovl_adaptor_connect(struct device *dev, struct device *mmsys_dev, 
unsigned int next)
 {
+       mtk_mmsys_ddp_connect(mmsys_dev, DDP_COMPONENT_ETHDR_MIXER, next);
        mtk_mmsys_ddp_connect(mmsys_dev, DDP_COMPONENT_MDP_RDMA0, 
DDP_COMPONENT_MERGE1);
        mtk_mmsys_ddp_connect(mmsys_dev, DDP_COMPONENT_MDP_RDMA1, 
DDP_COMPONENT_MERGE1);
        mtk_mmsys_ddp_connect(mmsys_dev, DDP_COMPONENT_MDP_RDMA2, 
DDP_COMPONENT_MERGE2);
@@ -406,11 +407,11 @@ void mtk_ovl_adaptor_connect(struct device *dev, struct 
device *mmsys_dev, unsig
        mtk_mmsys_ddp_connect(mmsys_dev, DDP_COMPONENT_MERGE2, 
DDP_COMPONENT_ETHDR_MIXER);
        mtk_mmsys_ddp_connect(mmsys_dev, DDP_COMPONENT_MERGE3, 
DDP_COMPONENT_ETHDR_MIXER);
        mtk_mmsys_ddp_connect(mmsys_dev, DDP_COMPONENT_MERGE4, 
DDP_COMPONENT_ETHDR_MIXER);
-       mtk_mmsys_ddp_connect(mmsys_dev, DDP_COMPONENT_ETHDR_MIXER, next);
 }
 
 void mtk_ovl_adaptor_disconnect(struct device *dev, struct device *mmsys_dev, 
unsigned int next)
 {
+       mtk_mmsys_ddp_disconnect(mmsys_dev, DDP_COMPONENT_ETHDR_MIXER, next);
        mtk_mmsys_ddp_disconnect(mmsys_dev, DDP_COMPONENT_MDP_RDMA0, 
DDP_COMPONENT_MERGE1);
        mtk_mmsys_ddp_disconnect(mmsys_dev, DDP_COMPONENT_MDP_RDMA1, 
DDP_COMPONENT_MERGE1);
        mtk_mmsys_ddp_disconnect(mmsys_dev, DDP_COMPONENT_MDP_RDMA2, 
DDP_COMPONENT_MERGE2);
@@ -418,7 +419,6 @@ void mtk_ovl_adaptor_disconnect(struct device *dev, struct 
device *mmsys_dev, un
        mtk_mmsys_ddp_disconnect(mmsys_dev, DDP_COMPONENT_MERGE2, 
DDP_COMPONENT_ETHDR_MIXER);
        mtk_mmsys_ddp_disconnect(mmsys_dev, DDP_COMPONENT_MERGE3, 
DDP_COMPONENT_ETHDR_MIXER);
        mtk_mmsys_ddp_disconnect(mmsys_dev, DDP_COMPONENT_MERGE4, 
DDP_COMPONENT_ETHDR_MIXER);
-       mtk_mmsys_ddp_disconnect(mmsys_dev, DDP_COMPONENT_ETHDR_MIXER, next);
 }
 
 static int ovl_adaptor_comp_get_id(struct device *dev, struct device_node 
*node,
-- 
2.18.0