Commit 37e278c8 authored by Eizan Miyamoto's avatar Eizan Miyamoto Committed by Mauro Carvalho Chehab

media: mtk-mdp: Remove mtk_mdp_comp.id and supporting functionality

Since components are registered in a list, the numeric component id that
specified a location in an array is not necessary.
Signed-off-by: default avatarEizan Miyamoto <eizan@chromium.org>
Reviewed-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 86698b95
...@@ -14,46 +14,6 @@ ...@@ -14,46 +14,6 @@
#include "mtk_mdp_comp.h" #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) void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp)
{ {
int i, err; int i, err;
...@@ -62,8 +22,8 @@ void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp) ...@@ -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); err = mtk_smi_larb_get(comp->larb_dev);
if (err) if (err)
dev_err(dev, dev_err(dev,
"failed to get larb, err %d. type:%d id:%d\n", "failed to get larb, err %d. type:%d\n",
err, comp->type, comp->id); err, comp->type);
} }
for (i = 0; i < ARRAY_SIZE(comp->clk); i++) { 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) ...@@ -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]); err = clk_prepare_enable(comp->clk[i]);
if (err) if (err)
dev_err(dev, dev_err(dev,
"failed to enable clock, err %d. type:%d id:%d i:%d\n", "failed to enable clock, err %d. type:%d i:%d\n",
err, comp->type, comp->id, i); err, comp->type, i);
} }
} }
...@@ -92,21 +52,15 @@ void mtk_mdp_comp_clock_off(struct device *dev, struct mtk_mdp_comp *comp) ...@@ -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, 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 device_node *larb_node;
struct platform_device *larb_pdev; struct platform_device *larb_pdev;
int i; 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->dev_node = of_node_get(node);
comp->id = comp_id; comp->type = comp_type;
comp->type = mtk_mdp_matches[comp_id].type;
for (i = 0; i < ARRAY_SIZE(comp->clk); i++) { for (i = 0; i < ARRAY_SIZE(comp->clk); i++) {
comp->clk[i] = of_clk_get(node, i); comp->clk[i] = of_clk_get(node, i);
......
...@@ -22,18 +22,6 @@ enum mtk_mdp_comp_type { ...@@ -22,18 +22,6 @@ enum mtk_mdp_comp_type {
MTK_MDP_COMP_TYPE_MAX, 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 * struct mtk_mdp_comp - the MDP's function component data
* @node: list node to track sibing MDP components * @node: list node to track sibing MDP components
...@@ -41,7 +29,6 @@ enum mtk_mdp_comp_id { ...@@ -41,7 +29,6 @@ enum mtk_mdp_comp_id {
* @clk: clocks required for component * @clk: clocks required for component
* @larb_dev: SMI device required for component * @larb_dev: SMI device required for component
* @type: component type * @type: component type
* @id: component ID
*/ */
struct mtk_mdp_comp { struct mtk_mdp_comp {
struct list_head node; struct list_head node;
...@@ -49,14 +36,12 @@ struct mtk_mdp_comp { ...@@ -49,14 +36,12 @@ struct mtk_mdp_comp {
struct clk *clk[2]; struct clk *clk[2];
struct device *larb_dev; struct device *larb_dev;
enum mtk_mdp_comp_type type; enum mtk_mdp_comp_type type;
enum mtk_mdp_comp_id id;
}; };
int mtk_mdp_comp_init(struct device *dev, struct device_node *node, 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); 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_on(struct device *dev, struct mtk_mdp_comp *comp);
void mtk_mdp_comp_clock_off(struct device *dev, struct mtk_mdp_comp *comp); void mtk_mdp_comp_clock_off(struct device *dev, struct mtk_mdp_comp *comp);
......
...@@ -137,7 +137,6 @@ static int mtk_mdp_probe(struct platform_device *pdev) ...@@ -137,7 +137,6 @@ static int mtk_mdp_probe(struct platform_device *pdev)
for_each_child_of_node(parent, node) { for_each_child_of_node(parent, node) {
const struct of_device_id *of_id; const struct of_device_id *of_id;
enum mtk_mdp_comp_type comp_type; enum mtk_mdp_comp_type comp_type;
int comp_id;
of_id = of_match_node(mtk_mdp_comp_dt_ids, node); of_id = of_match_node(mtk_mdp_comp_dt_ids, node);
if (!of_id) if (!of_id)
...@@ -150,12 +149,6 @@ static int mtk_mdp_probe(struct platform_device *pdev) ...@@ -150,12 +149,6 @@ static int mtk_mdp_probe(struct platform_device *pdev)
} }
comp_type = (enum mtk_mdp_comp_type)of_id->data; 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); comp = devm_kzalloc(dev, sizeof(*comp), GFP_KERNEL);
if (!comp) { if (!comp) {
...@@ -164,7 +157,7 @@ static int mtk_mdp_probe(struct platform_device *pdev) ...@@ -164,7 +157,7 @@ static int mtk_mdp_probe(struct platform_device *pdev)
goto err_comp; 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) { if (ret) {
of_node_put(node); of_node_put(node);
goto err_comp; goto err_comp;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment