| From 1b918f7f3004e7ca30f7a33b62ff7ddcdc85d63f Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm+renesas@opensource.se> |
| Date: Fri, 10 Nov 2017 14:25:26 +0100 |
| Subject: [PATCH 0605/1795] arm64: dts: renesas: r8a7795: Point VSPBC/VSPBD via |
| FCPVB to IPMMU-VP0/1 |
| |
| Hook up the FCPVB devices to allow use of VSPBC/VSPBD 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 cdd919ba225433a334b2f2c2ef71c7e70f80173e) |
| 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 736281335653..3d50627c0670 100644 |
| --- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi |
| +++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi |
| @@ -151,6 +151,10 @@ |
| <&ipmmu_mp1 30>, <&ipmmu_mp1 31>; |
| }; |
| |
| +&fcpvb1 { |
| + iommus = <&ipmmu_vp0 7>; |
| +}; |
| + |
| &fcpf1 { |
| iommus = <&ipmmu_vp0 1>; |
| }; |
| diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi |
| index f7d7c98a7f73..35efacd1ec21 100644 |
| --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi |
| +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi |
| @@ -2062,6 +2062,7 @@ |
| clocks = <&cpg CPG_MOD 606>; |
| power-domains = <&sysc R8A7795_PD_A3VP>; |
| resets = <&cpg 606>; |
| + iommus = <&ipmmu_vp1 7>; |
| }; |
| |
| fcpf0: fcp@fe950000 { |
| @@ -2099,6 +2100,7 @@ |
| clocks = <&cpg CPG_MOD 607>; |
| power-domains = <&sysc R8A7795_PD_A3VP>; |
| resets = <&cpg 607>; |
| + iommus = <&ipmmu_vp0 5>; |
| }; |
| |
| vspi0: vsp@fe9a0000 { |
| -- |
| 2.19.0 |
| |
