blob: a392bf3c6163b91b4a4c43759084850062f83f5b [file] [log] [blame]
From d9ad39ac96ee611ba280df32a9e265272c3a645c Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm+renesas@opensource.se>
Date: Fri, 10 Nov 2017 14:25:27 +0100
Subject: [PATCH 0606/1795] arm64: dts: renesas: r8a7795: Point VSPI via FCPVI
to IPMMU-VP0/1
Hook up the FCPVI devices to allow use of VSPI with
IPMMU-VP0 and IPMMU-VP1.
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>
(cherry picked from commit a02aac487325b5bba09a7fd48569d36eb2394a51)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 4 ++++
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2 ++
2 files changed, 6 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index 3d50627c0670..b2d2f04c5e1c 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -159,6 +159,10 @@
iommus = <&ipmmu_vp0 1>;
};
+&fcpvi1 {
+ iommus = <&ipmmu_vp0 9>;
+};
+
&fcpvd2 {
iommus = <&ipmmu_vi0 10>;
};
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 35efacd1ec21..10c7728d1b25 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -2120,6 +2120,7 @@
clocks = <&cpg CPG_MOD 611>;
power-domains = <&sysc R8A7795_PD_A3VP>;
resets = <&cpg 611>;
+ iommus = <&ipmmu_vp0 8>;
};
vspi1: vsp@fe9b0000 {
@@ -2139,6 +2140,7 @@
clocks = <&cpg CPG_MOD 610>;
power-domains = <&sysc R8A7795_PD_A3VP>;
resets = <&cpg 610>;
+ iommus = <&ipmmu_vp1 9>;
};
vspd0: vsp@fea20000 {
--
2.19.0