media: platform: mtk-mdp3: chip config split about subcomponents

Integrate subcomponent related information into specific config file for
further multi-chip compatibility.

Signed-off-by: Moudy Ho <moudy.ho@mediatek.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/platform/mediatek/mdp3/mdp_cfg_data.c b/drivers/media/platform/mediatek/mdp3/mdp_cfg_data.c
index 4bf7219..82e2e69 100644 (file)
--- a/drivers/media/platform/mediatek/mdp3/mdp_cfg_data.c
+++ b/drivers/media/platform/mediatek/mdp3/mdp_cfg_data.c
@@ -144,12 +144,24 @@ static const struct mdp_comp_data mt8183_mdp_comp_data[MDP_MAX_COMP_COUNT] = {
        },
 };
 
+static const struct of_device_id mt8183_sub_comp_dt_ids[] = {
+       {
+               .compatible = "mediatek,mt8183-mdp3-wdma",
+               .data = (void *)MDP_COMP_TYPE_PATH,
+       }, {
+               .compatible = "mediatek,mt8183-mdp3-wrot",
+               .data = (void *)MDP_COMP_TYPE_PATH,
+       },
+       {}
+};
+
 const struct mtk_mdp_driver_data mt8183_mdp_driver_data = {
        .mdp_probe_infra = mt8183_mdp_probe_infra,
        .mdp_cfg = &mt8183_plat_cfg,
        .mdp_mutex_table_idx = mt8183_mutex_idx,
        .comp_data = mt8183_mdp_comp_data,
        .comp_data_len = ARRAY_SIZE(mt8183_mdp_comp_data),
+       .mdp_sub_comp_dt_ids = mt8183_sub_comp_dt_ids,
 };
 
 s32 mdp_cfg_get_id_inner(struct mdp_dev *mdp_dev, enum mtk_mdp_comp_id id)

diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c
index 86aa031..49bfe00 100644 (file)
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c
@@ -610,17 +610,6 @@ static const struct of_device_id mdp_comp_dt_ids[] = {
        {}
 };
 
-static const struct of_device_id mdp_sub_comp_dt_ids[] = {
-       {
-               .compatible = "mediatek,mt8183-mdp3-wdma",
-               .data = (void *)MDP_COMP_TYPE_PATH,
-       }, {
-               .compatible = "mediatek,mt8183-mdp3-wrot",
-               .data = (void *)MDP_COMP_TYPE_PATH,
-       },
-       {}
-};
-
 static inline bool is_dma_capable(const enum mdp_comp_type type)
 {
        return (type == MDP_COMP_TYPE_RDMA ||
@@ -871,6 +860,7 @@ static int mdp_comp_sub_create(struct mdp_dev *mdp)
 {
        struct device *dev = &mdp->pdev->dev;
        struct device_node *node, *parent;
+       const struct mtk_mdp_driver_data *data = mdp->mdp_data;
 
        parent = dev->of_node->parent;
 
@@ -880,7 +870,7 @@ static int mdp_comp_sub_create(struct mdp_dev *mdp)
                int id, alias_id;
                struct mdp_comp *comp;
 
-               of_id = of_match_node(mdp_sub_comp_dt_ids, node);
+               of_id = of_match_node(data->mdp_sub_comp_dt_ids, node);
                if (!of_id)
                        continue;
                if (!of_device_is_available(node)) {

diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h
index 0c398ef..41eeba4 100644 (file)
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h
@@ -56,6 +56,7 @@ struct mtk_mdp_driver_data {
        const u32 *mdp_mutex_table_idx;
        const struct mdp_comp_data *comp_data;
        unsigned int comp_data_len;
+       const struct of_device_id *mdp_sub_comp_dt_ids;
 };
 
 struct mdp_dev {