Skip to content

Commit

Permalink
[media] dt-bindings: mt8173: Fix mdp device tree
Browse files Browse the repository at this point in the history
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: Minghsiu Tsai <minghsiu.tsai@mediatek.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
  • Loading branch information
Minghsiu Tsai authored and Mauro Carvalho Chehab committed Jun 7, 2017
1 parent f903ebf commit c5789f4
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions Documentation/devicetree/bindings/media/mediatek-mdp.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Media Data Path is used for scaling and color space conversion.

Required properties (controller (parent) node):
Required properties (controller node):
- compatible: "mediatek,mt8173-mdp"
- mediatek,vpu: the node of video processor unit, see
Documentation/devicetree/bindings/media/mediatek-vpu.txt for details.
Expand Down Expand Up @@ -32,21 +32,16 @@ Required properties (DMA function blocks, child node):
for details.

Example:
mdp {
compatible = "mediatek,mt8173-mdp";
#address-cells = <2>;
#size-cells = <2>;
ranges;
mediatek,vpu = <&vpu>;

mdp_rdma0: rdma@14001000 {
compatible = "mediatek,mt8173-mdp-rdma";
"mediatek,mt8173-mdp";
reg = <0 0x14001000 0 0x1000>;
clocks = <&mmsys CLK_MM_MDP_RDMA0>,
<&mmsys CLK_MM_MUTEX_32K>;
power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;
iommus = <&iommu M4U_PORT_MDP_RDMA0>;
mediatek,larb = <&larb0>;
mediatek,vpu = <&vpu>;
};

mdp_rdma1: rdma@14002000 {
Expand Down Expand Up @@ -106,4 +101,3 @@ mdp {
iommus = <&iommu M4U_PORT_MDP_WROT1>;
mediatek,larb = <&larb4>;
};
};

0 comments on commit c5789f4

Please sign in to comment.