aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakeshi Kihara <takeshi.kihara.df@renesas.com>2018-11-26 16:10:05 +0900
committerRyo Kataoka <ryo.kataoka.wt@renesas.com>2018-12-07 19:57:05 +0900
commitce383706d55968c21741e7b9dadc4e402f6ad83d (patch)
tree01d48bc6f84d41ef0aaec26155a14a2c79794f48
parentd136e1fc89ed9258418713493d257132a44d54bf (diff)
downloadrenesas-bsp-ce383706d55968c21741e7b9dadc4e402f6ad83d.tar.gz
arm64: dts: r8a77990: Detach IPMMU-VI0/1 from FCPVD
This patch changes the IPMMU address translation for FCPVD to disabled by default. This maintains the same IPMMU support environment as the previously released R-Car Linux BSP. Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
-rw-r--r--arch/arm64/boot/dts/renesas/r8a77990.dtsi2
-rw-r--r--arch/arm64/boot/dts/renesas/ulcb.dtsi2
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm64/boot/dts/renesas/r8a77990.dtsi b/arch/arm64/boot/dts/renesas/r8a77990.dtsi
index 8defc25179cd2..1e674843e70d3 100644
--- a/arch/arm64/boot/dts/renesas/r8a77990.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77990.dtsi
@@ -1705,7 +1705,6 @@
clocks = <&cpg CPG_MOD 603>;
power-domains = <&sysc R8A77990_PD_ALWAYS_ON>;
resets = <&cpg 603>;
- iommus = <&ipmmu_vi0 8>;
};
fcpvd1: fcp@fea2f000 {
@@ -1714,7 +1713,6 @@
clocks = <&cpg CPG_MOD 602>;
power-domains = <&sysc R8A77990_PD_ALWAYS_ON>;
resets = <&cpg 602>;
- iommus = <&ipmmu_vi0 9>;
};
vsp@fe960000 {
diff --git a/arch/arm64/boot/dts/renesas/ulcb.dtsi b/arch/arm64/boot/dts/renesas/ulcb.dtsi
index 94d58a8da31f1..b60fd45f0a172 100644
--- a/arch/arm64/boot/dts/renesas/ulcb.dtsi
+++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi
@@ -32,7 +32,7 @@
clock-frequency = <12288000>;
};
- avb-mch {
+ avb-mch@ec5a0100 {
compatible = "renesas,avb-mch-gen3";
reg = <0 0xec5a0100 0 0x100>; /* ADG_AVB */
reg-name = "adg_avb";