summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Damm <damm+renesas@opensource.se>2017-11-10 14:25:24 +0100
committerSimon Horman <horms+renesas@verge.net.au>2017-11-28 09:36:27 +0100
commitafdeb149aaecdd7151f4e43f2531dee59e53ced0 (patch)
tree2d9566633ef21d1834c1d1e903a60ee5b896dffc
parentf54de024ef009502a7a767b8263e93edb05a13bd (diff)
downloadlinux-stable-afdeb149aaecdd7151f4e43f2531dee59e53ced0.tar.gz
linux-stable-afdeb149aaecdd7151f4e43f2531dee59e53ced0.tar.bz2
linux-stable-afdeb149aaecdd7151f4e43f2531dee59e53ced0.zip
arm64: dts: renesas: r8a7795: Point FDP1 via FCPF to IPMMU-VP0/1
Hook up the FCPF devices to allow use of FDP1 with IPMMU-VP. 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.dtsi2
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index 1eafa5382e86..6b4dfa42f5b2 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -150,6 +150,10 @@
<&ipmmu_mp1 30>, <&ipmmu_mp1 31>;
};
+&fcpf1 {
+ iommus = <&ipmmu_vp0 1>;
+};
+
&fcpvd2 {
iommus = <&ipmmu_vi0 10>;
};
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 6187e9c33e88..f7d7c98a7f73 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -2070,6 +2070,7 @@
clocks = <&cpg CPG_MOD 615>;
power-domains = <&sysc R8A7795_PD_A3VP>;
resets = <&cpg 615>;
+ iommus = <&ipmmu_vp0 0>;
};
fcpf1: fcp@fe951000 {
@@ -2078,6 +2079,7 @@
clocks = <&cpg CPG_MOD 614>;
power-domains = <&sysc R8A7795_PD_A3VP>;
resets = <&cpg 614>;
+ iommus = <&ipmmu_vp1 1>;
};
vspbd: vsp@fe960000 {