aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHai Nguyen Pham <hai.pham.ud@renesas.com>2018-03-12 18:48:30 +0900
committerRyo Kataoka <ryo.kataoka.wt@renesas.com>2018-12-07 19:57:07 +0900
commitf8705902db81ea5de854e4c5a3c436b4f77293c4 (patch)
tree74c87810c6186a009a1b674a3666ff37a51bcf66
parente3b59c74c58e010624be530cc76a1ce1d4c0ab9f (diff)
downloadrenesas-bsp-f8705902db81ea5de854e4c5a3c436b4f77293c4.tar.gz
arm64: dts: r8a77965: Change IPMMU-MM and IPMMU-caches order in DT
In current implementation, IPMMU-caches will defer probe for waiting IPMMU-MM by returning -EPROBE_DEFER. However, it leads to other driver, e.g. DMAC, which rely on IPMMU-caches to setup its configuration, defer probe as well. As a workaround for this issue, reorder IPMMU-MM and IPMMU-caches in DT in order to make IPMMU-MM probe first since current driver only parses DT info when setting up IPMMU domain. Signed-off-by: Hai Nguyen Pham <hai.pham.ud@renesas.com> Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
-rw-r--r--arch/arm64/boot/dts/renesas/r8a77965.dtsi20
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm64/boot/dts/renesas/r8a77965.dtsi b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
index 2725139919e82..c31946d7fc286 100644
--- a/arch/arm64/boot/dts/renesas/r8a77965.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
@@ -844,6 +844,16 @@
<&ipmmu_ds1 30>, <&ipmmu_ds1 31>;
};
+ ipmmu_mm: mmu@e67b0000 {
+ compatible = "renesas,ipmmu-r8a77965";
+ reg = <0 0xe67b0000 0 0x1000>;
+ interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>;
+ power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
+ #iommu-cells = <1>;
+ status = "disabled";
+ };
+
ipmmu_ds0: mmu@e6740000 {
compatible = "renesas,ipmmu-r8a77965";
reg = <0 0xe6740000 0 0x1000>;
@@ -871,16 +881,6 @@
status = "disabled";
};
- ipmmu_mm: mmu@e67b0000 {
- compatible = "renesas,ipmmu-r8a77965";
- reg = <0 0xe67b0000 0 0x1000>;
- interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>;
- power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
- #iommu-cells = <1>;
- status = "disabled";
- };
-
ipmmu_mp: mmu@ec670000 {
compatible = "renesas,ipmmu-r8a77965";
reg = <0 0xec670000 0 0x1000>;