Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8127881f authored by Daniel Kurtz's avatar Daniel Kurtz Committed by Matthias Brugger
Browse files

arm64: dts: mt8173: 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: default avatarDaniel Kurtz <djkurtz@chromium.org>
Signed-off-by: default avatarMinghsiu Tsai <minghsiu.tsai@mediatek.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
parent c6c301d3

arch/arm64/boot/dts/mediatek/mt8173.dtsi

+60 −66
Original line number Diff line number Diff line
@@ -803,21 +803,16 @@ 
			#clock-cells = <1>;

		};



		mdp {

			compatible = "mediatek,mt8173-mdp";

			#address-cells = <2>;

			#size-cells = <2>;

			ranges;

			mediatek,vpu = <&vpu>;



		mdp_rdma0: rdma@14001000 {

				compatible = "mediatek,mt8173-mdp-rdma";

			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 {
@@ -877,7 +872,6 @@ 
			iommus = <&iommu M4U_PORT_MDP_WROT1>;

			mediatek,larb = <&larb4>;

		};

		};



		ovl0: ovl@1400c000 {

			compatible = "mediatek,mt8173-disp-ovl";