From 2c3f2141f576e1c8f03d94082d44f5edff69b415 Mon Sep 17 00:00:00 2001 From: Harini Katakam Date: Wed, 5 Sep 2018 16:47:26 +0530 Subject: [PATCH] arm64: zynqmp: Make SMMU a separate node outside amba Drivers dependent on IOMMU expect SMMU to be probed first and in PM flow, suspended last and resumed first. This can ideally be achieved by adding PM support in arm-smmu and maintaining the above expected order. This series on LKML proposes the same: https://patchwork.ozlabs.org/cover/885035/ But this is still under review and would require pulling in more framework changes on the current xilinx tree. Hence this patch provides a temporary fix until the above solution is finalized. The expected order is maintained by moving SMMU node outside amba node in the devicetree. Signed-off-by: Harini Katakam Signed-off-by: Michal Simek --- arch/arm/dts/zynqmp.dtsi | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi index ff5a2314bfe..f4031978975 100644 --- a/arch/arm/dts/zynqmp.dtsi +++ b/arch/arm/dts/zynqmp.dtsi @@ -366,6 +366,20 @@ }; }; + smmu: smmu@fd800000 { + compatible = "arm,mmu-500"; + reg = <0x0 0xfd800000 0x0 0x20000>; + #iommu-cells = <1>; + status = "okay"; + #global-interrupts = <1>; + interrupt-parent = <&gic>; + interrupts = <0 155 4>, + <0 155 4>, <0 155 4>, <0 155 4>, <0 155 4>, + <0 155 4>, <0 155 4>, <0 155 4>, <0 155 4>, + <0 155 4>, <0 155 4>, <0 155 4>, <0 155 4>, + <0 155 4>, <0 155 4>, <0 155 4>, <0 155 4>; + }; + amba: amba { compatible = "simple-bus"; u-boot,dm-pre-reloc; @@ -970,20 +984,6 @@ nvmem-cell-names = "soc_revision"; }; - smmu: smmu@fd800000 { - compatible = "arm,mmu-500"; - reg = <0x0 0xfd800000 0x0 0x20000>; - #iommu-cells = <1>; - status = "okay"; - #global-interrupts = <1>; - interrupt-parent = <&gic>; - interrupts = <0 155 4>, - <0 155 4>, <0 155 4>, <0 155 4>, <0 155 4>, - <0 155 4>, <0 155 4>, <0 155 4>, <0 155 4>, - <0 155 4>, <0 155 4>, <0 155 4>, <0 155 4>, - <0 155 4>, <0 155 4>, <0 155 4>, <0 155 4>; - }; - spi0: spi@ff040000 { compatible = "cdns,spi-r1p6"; status = "disabled"; -- 2.47.3