| From 84e1d1d1416e9519128f6b3957f943c368d14b2d Mon Sep 17 00:00:00 2001 |
| From: Simon Horman <horms+renesas@verge.net.au> |
| Date: Tue, 6 Mar 2018 10:34:30 +0100 |
| Subject: [PATCH 1029/1795] arm64: dts: renesas: r8a7795: Add IPMMU-PV1 device |
| node |
| |
| Add r8a7795 IPMMU-PV1 and keep it disabled by default. |
| |
| This device is not present in r8a7795 ES1.x and |
| is removed from the DT of those SoCs. |
| |
| This corrects an omission in |
| 3b7e7848f0e8 ("arm64: dts: renesas: r8a7795: Add IPMMU device nodes") |
| |
| This does not have any runtime effect. |
| |
| Reported-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> |
| (cherry picked from commit 9dd660eb1c201304b5d79012695fc6bca57f99a0) |
| 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 | 1 + |
| arch/arm64/boot/dts/renesas/r8a7795.dtsi | 9 +++++++++ |
| 2 files changed, 10 insertions(+) |
| |
| diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi |
| index f1d5e90503d5..f9acd125d687 100644 |
| --- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi |
| +++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi |
| @@ -23,6 +23,7 @@ |
| |
| /delete-node/ mmu@febe0000; |
| /delete-node/ mmu@fe980000; |
| + /delete-node/ mmu@fd950000; |
| /delete-node/ mmu@fd960000; |
| /delete-node/ mmu@fd970000; |
| |
| diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi |
| index 09953cda3a55..0648fe451d09 100644 |
| --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi |
| +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi |
| @@ -545,6 +545,15 @@ |
| status = "disabled"; |
| }; |
| |
| + ipmmu_pv1: mmu@fd950000 { |
| + compatible = "renesas,ipmmu-r8a7795"; |
| + reg = <0 0xfd950000 0 0x1000>; |
| + renesas,ipmmu-main = <&ipmmu_mm 7>; |
| + power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; |
| + #iommu-cells = <1>; |
| + status = "disabled"; |
| + }; |
| + |
| ipmmu_pv2: mmu@fd960000 { |
| compatible = "renesas,ipmmu-r8a7795"; |
| reg = <0 0xfd960000 0 0x1000>; |
| -- |
| 2.19.0 |
| |
