| Message ID | 20200507202337.v3.5.I1c85bddc262913b8572d892dd6bf9bc03fbe0ec7@changeid (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 37e278c801078dcf165983a83f7cbefbae856004 |
| Headers | show |
| Series | MTK MDP driver cleanups to prep for futher work | expand |
Hi Eizan, Missatge de Eizan Miyamoto <eizan@chromium.org> del dia dj., 7 de maig 2020 a les 12:26: > > Since components are registered in a list, the numeric component id that > specified a location in an array is not necessary. > > Signed-off-by: Eizan Miyamoto <eizan@chromium.org> It looks good to me, so Reviewed-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> > --- > > Changes in v3: > - Removed extra Signed-off-by: tag from commit messages. > - Removed extra line break in mtk_mdp_core.c > - Update cover letter with dependent commit > > Changes in v2: > - rebase onto linux-next/master to pick up > 757570f11fa4b0ce5472a6583de6f06e996a8527 > > drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 60 +++---------------- > drivers/media/platform/mtk-mdp/mtk_mdp_comp.h | 19 +----- > drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 9 +-- > 3 files changed, 10 insertions(+), 78 deletions(-) > > diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c > index da2bdad7a8d1..362fff924aef 100644 > --- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c > +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c > @@ -14,46 +14,6 @@ > #include "mtk_mdp_comp.h" > > > -static const char * const mtk_mdp_comp_stem[MTK_MDP_COMP_TYPE_MAX] = { > - "mdp-rdma", > - "mdp-rsz", > - "mdp-wdma", > - "mdp-wrot", > -}; > - > -struct mtk_mdp_comp_match { > - enum mtk_mdp_comp_type type; > - int alias_id; > -}; > - > -static const struct mtk_mdp_comp_match mtk_mdp_matches[MTK_MDP_COMP_ID_MAX] = { > - { MTK_MDP_RDMA, 0 }, > - { MTK_MDP_RDMA, 1 }, > - { MTK_MDP_RSZ, 0 }, > - { MTK_MDP_RSZ, 1 }, > - { MTK_MDP_RSZ, 2 }, > - { MTK_MDP_WDMA, 0 }, > - { MTK_MDP_WROT, 0 }, > - { MTK_MDP_WROT, 1 }, > -}; > - > -int mtk_mdp_comp_get_id(struct device *dev, struct device_node *node, > - enum mtk_mdp_comp_type comp_type) > -{ > - int id = of_alias_get_id(node, mtk_mdp_comp_stem[comp_type]); > - int i; > - > - for (i = 0; i < ARRAY_SIZE(mtk_mdp_matches); i++) { > - if (comp_type == mtk_mdp_matches[i].type && > - id == mtk_mdp_matches[i].alias_id) > - return i; > - } > - > - dev_err(dev, "Failed to get id. type: %d, id: %d\n", comp_type, id); > - > - return -EINVAL; > -} > - > void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp) > { > int i, err; > @@ -62,8 +22,8 @@ void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp) > err = mtk_smi_larb_get(comp->larb_dev); > if (err) > dev_err(dev, > - "failed to get larb, err %d. type:%d id:%d\n", > - err, comp->type, comp->id); > + "failed to get larb, err %d. type:%d\n", > + err, comp->type); > } > > for (i = 0; i < ARRAY_SIZE(comp->clk); i++) { > @@ -72,8 +32,8 @@ void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp) > err = clk_prepare_enable(comp->clk[i]); > if (err) > dev_err(dev, > - "failed to enable clock, err %d. type:%d id:%d i:%d\n", > - err, comp->type, comp->id, i); > + "failed to enable clock, err %d. type:%d i:%d\n", > + err, comp->type, i); > } > } > > @@ -92,21 +52,15 @@ void mtk_mdp_comp_clock_off(struct device *dev, struct mtk_mdp_comp *comp) > } > > int mtk_mdp_comp_init(struct device *dev, struct device_node *node, > - struct mtk_mdp_comp *comp, enum mtk_mdp_comp_id comp_id) > + struct mtk_mdp_comp *comp, > + enum mtk_mdp_comp_type comp_type) > { > struct device_node *larb_node; > struct platform_device *larb_pdev; > int i; > > - if (comp_id < 0 || comp_id >= MTK_MDP_COMP_ID_MAX) { > - dev_err(dev, "Invalid comp_id %d\n", comp_id); > - return -EINVAL; > - } > - > - INIT_LIST_HEAD(&comp->node); > comp->dev_node = of_node_get(node); > - comp->id = comp_id; > - comp->type = mtk_mdp_matches[comp_id].type; > + comp->type = comp_type; > > for (i = 0; i < ARRAY_SIZE(comp->clk); i++) { > comp->clk[i] = of_clk_get(node, i); > diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h > index 1f745891c6c3..1bf0242cce46 100644 > --- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h > +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h > @@ -22,18 +22,6 @@ enum mtk_mdp_comp_type { > MTK_MDP_COMP_TYPE_MAX, > }; > > -enum mtk_mdp_comp_id { > - MTK_MDP_COMP_RDMA0, > - MTK_MDP_COMP_RDMA1, > - MTK_MDP_COMP_RSZ0, > - MTK_MDP_COMP_RSZ1, > - MTK_MDP_COMP_RSZ2, > - MTK_MDP_COMP_WDMA, > - MTK_MDP_COMP_WROT0, > - MTK_MDP_COMP_WROT1, > - MTK_MDP_COMP_ID_MAX, > -}; > - > /** > * struct mtk_mdp_comp - the MDP's function component data > * @node: list node to track sibing MDP components > @@ -41,7 +29,6 @@ enum mtk_mdp_comp_id { > * @clk: clocks required for component > * @larb_dev: SMI device required for component > * @type: component type > - * @id: component ID > */ > struct mtk_mdp_comp { > struct list_head node; > @@ -49,14 +36,12 @@ struct mtk_mdp_comp { > struct clk *clk[2]; > struct device *larb_dev; > enum mtk_mdp_comp_type type; > - enum mtk_mdp_comp_id id; > }; > > int mtk_mdp_comp_init(struct device *dev, struct device_node *node, > - struct mtk_mdp_comp *comp, enum mtk_mdp_comp_id comp_id); > + struct mtk_mdp_comp *comp, > + enum mtk_mdp_comp_type comp_type); > void mtk_mdp_comp_deinit(struct device *dev, struct mtk_mdp_comp *comp); > -int mtk_mdp_comp_get_id(struct device *dev, struct device_node *node, > - enum mtk_mdp_comp_type comp_type); > void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp); > void mtk_mdp_comp_clock_off(struct device *dev, struct mtk_mdp_comp *comp); > > diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c > index 40b9fda8b03b..f96c8b3bf861 100644 > --- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c > +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c > @@ -137,7 +137,6 @@ static int mtk_mdp_probe(struct platform_device *pdev) > for_each_child_of_node(parent, node) { > const struct of_device_id *of_id; > enum mtk_mdp_comp_type comp_type; > - int comp_id; > > of_id = of_match_node(mtk_mdp_comp_dt_ids, node); > if (!of_id) > @@ -150,12 +149,6 @@ static int mtk_mdp_probe(struct platform_device *pdev) > } > > comp_type = (enum mtk_mdp_comp_type)of_id->data; > - comp_id = mtk_mdp_comp_get_id(dev, node, comp_type); > - if (comp_id < 0) { > - dev_warn(dev, "Skipping unknown component %pOF\n", > - node); > - continue; > - } > > comp = devm_kzalloc(dev, sizeof(*comp), GFP_KERNEL); > if (!comp) { > @@ -164,7 +157,7 @@ static int mtk_mdp_probe(struct platform_device *pdev) > goto err_comp; > } > > - ret = mtk_mdp_comp_init(dev, node, comp, comp_id); > + ret = mtk_mdp_comp_init(dev, node, comp, comp_type); > if (ret) { > of_node_put(node); > goto err_comp; > -- > 2.26.2.526.g744177e7f7-goog > > > _______________________________________________ > Linux-mediatek mailing list > Linux-mediatek@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-mediatek
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c index da2bdad7a8d1..362fff924aef 100644 --- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c @@ -14,46 +14,6 @@ #include "mtk_mdp_comp.h" -static const char * const mtk_mdp_comp_stem[MTK_MDP_COMP_TYPE_MAX] = { - "mdp-rdma", - "mdp-rsz", - "mdp-wdma", - "mdp-wrot", -}; - -struct mtk_mdp_comp_match { - enum mtk_mdp_comp_type type; - int alias_id; -}; - -static const struct mtk_mdp_comp_match mtk_mdp_matches[MTK_MDP_COMP_ID_MAX] = { - { MTK_MDP_RDMA, 0 }, - { MTK_MDP_RDMA, 1 }, - { MTK_MDP_RSZ, 0 }, - { MTK_MDP_RSZ, 1 }, - { MTK_MDP_RSZ, 2 }, - { MTK_MDP_WDMA, 0 }, - { MTK_MDP_WROT, 0 }, - { MTK_MDP_WROT, 1 }, -}; - -int mtk_mdp_comp_get_id(struct device *dev, struct device_node *node, - enum mtk_mdp_comp_type comp_type) -{ - int id = of_alias_get_id(node, mtk_mdp_comp_stem[comp_type]); - int i; - - for (i = 0; i < ARRAY_SIZE(mtk_mdp_matches); i++) { - if (comp_type == mtk_mdp_matches[i].type && - id == mtk_mdp_matches[i].alias_id) - return i; - } - - dev_err(dev, "Failed to get id. type: %d, id: %d\n", comp_type, id); - - return -EINVAL; -} - void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp) { int i, err; @@ -62,8 +22,8 @@ void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp) err = mtk_smi_larb_get(comp->larb_dev); if (err) dev_err(dev, - "failed to get larb, err %d. type:%d id:%d\n", - err, comp->type, comp->id); + "failed to get larb, err %d. type:%d\n", + err, comp->type); } for (i = 0; i < ARRAY_SIZE(comp->clk); i++) { @@ -72,8 +32,8 @@ void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp) err = clk_prepare_enable(comp->clk[i]); if (err) dev_err(dev, - "failed to enable clock, err %d. type:%d id:%d i:%d\n", - err, comp->type, comp->id, i); + "failed to enable clock, err %d. type:%d i:%d\n", + err, comp->type, i); } } @@ -92,21 +52,15 @@ void mtk_mdp_comp_clock_off(struct device *dev, struct mtk_mdp_comp *comp) } int mtk_mdp_comp_init(struct device *dev, struct device_node *node, - struct mtk_mdp_comp *comp, enum mtk_mdp_comp_id comp_id) + struct mtk_mdp_comp *comp, + enum mtk_mdp_comp_type comp_type) { struct device_node *larb_node; struct platform_device *larb_pdev; int i; - if (comp_id < 0 || comp_id >= MTK_MDP_COMP_ID_MAX) { - dev_err(dev, "Invalid comp_id %d\n", comp_id); - return -EINVAL; - } - - INIT_LIST_HEAD(&comp->node); comp->dev_node = of_node_get(node); - comp->id = comp_id; - comp->type = mtk_mdp_matches[comp_id].type; + comp->type = comp_type; for (i = 0; i < ARRAY_SIZE(comp->clk); i++) { comp->clk[i] = of_clk_get(node, i); diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h index 1f745891c6c3..1bf0242cce46 100644 --- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h @@ -22,18 +22,6 @@ enum mtk_mdp_comp_type { MTK_MDP_COMP_TYPE_MAX, }; -enum mtk_mdp_comp_id { - MTK_MDP_COMP_RDMA0, - MTK_MDP_COMP_RDMA1, - MTK_MDP_COMP_RSZ0, - MTK_MDP_COMP_RSZ1, - MTK_MDP_COMP_RSZ2, - MTK_MDP_COMP_WDMA, - MTK_MDP_COMP_WROT0, - MTK_MDP_COMP_WROT1, - MTK_MDP_COMP_ID_MAX, -}; - /** * struct mtk_mdp_comp - the MDP's function component data * @node: list node to track sibing MDP components @@ -41,7 +29,6 @@ enum mtk_mdp_comp_id { * @clk: clocks required for component * @larb_dev: SMI device required for component * @type: component type - * @id: component ID */ struct mtk_mdp_comp { struct list_head node; @@ -49,14 +36,12 @@ struct mtk_mdp_comp { struct clk *clk[2]; struct device *larb_dev; enum mtk_mdp_comp_type type; - enum mtk_mdp_comp_id id; }; int mtk_mdp_comp_init(struct device *dev, struct device_node *node, - struct mtk_mdp_comp *comp, enum mtk_mdp_comp_id comp_id); + struct mtk_mdp_comp *comp, + enum mtk_mdp_comp_type comp_type); void mtk_mdp_comp_deinit(struct device *dev, struct mtk_mdp_comp *comp); -int mtk_mdp_comp_get_id(struct device *dev, struct device_node *node, - enum mtk_mdp_comp_type comp_type); void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp); void mtk_mdp_comp_clock_off(struct device *dev, struct mtk_mdp_comp *comp); diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c index 40b9fda8b03b..f96c8b3bf861 100644 --- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c @@ -137,7 +137,6 @@ static int mtk_mdp_probe(struct platform_device *pdev) for_each_child_of_node(parent, node) { const struct of_device_id *of_id; enum mtk_mdp_comp_type comp_type; - int comp_id; of_id = of_match_node(mtk_mdp_comp_dt_ids, node); if (!of_id) @@ -150,12 +149,6 @@ static int mtk_mdp_probe(struct platform_device *pdev) } comp_type = (enum mtk_mdp_comp_type)of_id->data; - comp_id = mtk_mdp_comp_get_id(dev, node, comp_type); - if (comp_id < 0) { - dev_warn(dev, "Skipping unknown component %pOF\n", - node); - continue; - } comp = devm_kzalloc(dev, sizeof(*comp), GFP_KERNEL); if (!comp) { @@ -164,7 +157,7 @@ static int mtk_mdp_probe(struct platform_device *pdev) goto err_comp; } - ret = mtk_mdp_comp_init(dev, node, comp, comp_id); + ret = mtk_mdp_comp_init(dev, node, comp, comp_type); if (ret) { of_node_put(node); goto err_comp;
Since components are registered in a list, the numeric component id that specified a location in an array is not necessary. Signed-off-by: Eizan Miyamoto <eizan@chromium.org> --- Changes in v3: - Removed extra Signed-off-by: tag from commit messages. - Removed extra line break in mtk_mdp_core.c - Update cover letter with dependent commit Changes in v2: - rebase onto linux-next/master to pick up 757570f11fa4b0ce5472a6583de6f06e996a8527 drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 60 +++---------------- drivers/media/platform/mtk-mdp/mtk_mdp_comp.h | 19 +----- drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 9 +-- 3 files changed, 10 insertions(+), 78 deletions(-)