In order to test VSP+DU integration for Gen3 on Gen2, link the VSPD
instances to the DU and modify their features to match the Gen3 VSPD.
Remove the IOMMU properties for the DU as memory is now accessed through
the VSPD.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx>
---
arch/arm/boot/dts/r8a7790.dtsi | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 637cb8be363f..0ff45867e711 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -969,7 +969,7 @@
renesas,#wpf = <4>;
};
- vsp1@fe930000 {
+ vsp1d0: vsp1@fe930000 {
compatible = "renesas,vsp1";
reg = <0 0xfe930000 0 0x8000>;
interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
@@ -979,13 +979,11 @@
iommus = <&ipmmu_mx 5 &ipmmu_mx 13>;
renesas,has-lif;
- renesas,has-lut;
renesas,#rpf = <4>;
- renesas,#uds = <1>;
- renesas,#wpf = <4>;
+ renesas,#wpf = <1>;
};
- vsp1@fe938000 {
+ vsp1d1: vsp1@fe938000 {
compatible = "renesas,vsp1";
reg = <0 0xfe938000 0 0x8000>;
interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;
@@ -995,10 +993,8 @@
iommus = <&ipmmu_mx 5 &ipmmu_mx 14>;
renesas,has-lif;
- renesas,has-lut;
renesas,#rpf = <4>;
- renesas,#uds = <1>;
- renesas,#wpf = <4>;
+ renesas,#wpf = <1>;
};
du: display@feb00000 {
@@ -1018,7 +1014,7 @@
clock-names = "du.0", "du.1", "du.2", "lvds.0", "lvds.1";
status = "disabled";
- iommus = <&ipmmu_mx 15 &ipmmu_mx 16>;
+ vsps = <&vsp1d0 &vsp1d1>;
ports {
#address-cells = <1>;
--
Regards,
Laurent Pinchart
