Revert "arm64: zynqmp: Make SMMU a separate node outside amba"

This reverts commit 2c3f2141f576e1c8f03d94082d44f5edff69b415.

Also disable status and change smmu to iommu based on Linux upstreaming

https://lore.kernel.org/r/20200629081744.13916-1-krzk@kernel.org
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi
index 6e6c2844a17ab42e7bf53b535eb9f16fd2c35265..22b98a9565f11eddee014123958d5aff2ae436e2 100644 (file)
--- a/arch/arm/dts/zynqmp.dtsi
+++ b/arch/arm/dts/zynqmp.dtsi
@@ -277,21 +277,6 @@
                ranges;
        };
 
-
-       smmu: smmu@fd800000 {
-               compatible = "arm,mmu-500";
-               reg = <0x0 0xfd800000 0x0 0x20000>;
-               #iommu-cells = <1>;
-               status = "disabled";
-               #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: axi {
                compatible = "simple-bus";
                u-boot,dm-pre-reloc;
@@ -891,6 +876,20 @@
                        power-domains = <&zynqmp_firmware PD_SD_1>;
                };
 
+               smmu: iommu@fd800000 {
+                       compatible = "arm,mmu-500";
+                       reg = <0x0 0xfd800000 0x0 0x20000>;
+                       #iommu-cells = <1>;
+                       status = "disabled";
+                       #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";