aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Damm <damm+renesas@opensource.se>2017-11-10 14:25:22 +0100
committerSimon Horman <horms+renesas@verge.net.au>2017-11-28 09:36:26 +0100
commit45b894a9fc324291adabaeadb5e9e0d28192860d (patch)
treea262ee88c99283d0a71a72a059e6aae34958c4f9
parentarm64: dts: renesas: r8a7795: Tie Audio-DMAC to IPMMU-MP0/1 (diff)
downloadlinux-dev-45b894a9fc324291adabaeadb5e9e0d28192860d.tar.xz
linux-dev-45b894a9fc324291adabaeadb5e9e0d28192860d.zip
arm64: dts: renesas: r8a7795: Point DU/VSPD via FCPVD to IPMMU-VI0/1
Hook up the FCPVD devices to allow use of the VSP and DU together with IPMMU-VI1 and IPMMU-VI1. Signed-off-by: Magnus Damm <damm+renesas@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
-rw-r--r--arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi4
-rw-r--r--arch/arm64/boot/dts/renesas/r8a7795.dtsi3
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index 2dfe8108072c..71499d193ddb 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -149,6 +149,10 @@
<&ipmmu_mp1 30>, <&ipmmu_mp1 31>;
};
+&fcpvd2 {
+ iommus = <&ipmmu_vi0 10>;
+};
+
&du {
vsps = <&vspd0 &vspd1 &vspd2 &vspd3>;
};
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 2ca746c304d5..6187e9c33e88 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -2154,6 +2154,7 @@
clocks = <&cpg CPG_MOD 603>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
resets = <&cpg 603>;
+ iommus = <&ipmmu_vi0 8>;
};
vspd1: vsp@fea28000 {
@@ -2173,6 +2174,7 @@
clocks = <&cpg CPG_MOD 602>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
resets = <&cpg 602>;
+ iommus = <&ipmmu_vi0 9>;
};
vspd2: vsp@fea30000 {
@@ -2192,6 +2194,7 @@
clocks = <&cpg CPG_MOD 601>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
resets = <&cpg 601>;
+ iommus = <&ipmmu_vi1 10>;
};
fdp1@fe940000 {