提交 ba1f1f70 编写于 作者: D Daniel Kurtz 提交者: Mauro Carvalho Chehab

[media] media: mtk-mdp: Fix mdp device tree

If the mdp_* nodes are under an mdp sub-node, their corresponding
platform device does not automatically get its iommu assigned properly.

Fix this by moving the mdp component nodes up a level such that they are
siblings of mdp and all other SoC subsystems.  This also simplifies the
device tree.

Although it fixes iommu assignment issue, it also break compatibility
with old device tree. So, the patch in driver is needed to iterate over
sibling mdp device nodes, not child ones, to keep driver work properly.
Signed-off-by: NDaniel Kurtz <djkurtz@chromium.org>
Signed-off-by: NMinghsiu Tsai <minghsiu.tsai@mediatek.com>
Signed-off-by: NMatthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: NHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>
上级 c5789f41
......@@ -103,7 +103,7 @@ static int mtk_mdp_probe(struct platform_device *pdev)
{
struct mtk_mdp_dev *mdp;
struct device *dev = &pdev->dev;
struct device_node *node;
struct device_node *node, *parent;
int i, ret = 0;
mdp = devm_kzalloc(dev, sizeof(*mdp), GFP_KERNEL);
......@@ -117,8 +117,16 @@ static int mtk_mdp_probe(struct platform_device *pdev)
mutex_init(&mdp->lock);
mutex_init(&mdp->vpulock);
/* Old dts had the components as child nodes */
if (of_get_next_child(dev->of_node, NULL)) {
parent = dev->of_node;
dev_warn(dev, "device tree is out of date\n");
} else {
parent = dev->of_node->parent;
}
/* Iterate over sibling MDP function blocks */
for_each_child_of_node(dev->of_node, node) {
for_each_child_of_node(parent, node) {
const struct of_device_id *of_id;
enum mtk_mdp_comp_type comp_type;
int comp_id;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册