From 2935150c35995334368883f806fb2f5f852020e1 Mon Sep 17 00:00:00 2001
From: Alex Pavey <Alex.Pavey@dornerworks.com>
Date: Thu, 29 Oct 2020 13:48:04 -0400
Subject: [PATCH] zynqmp/ultra96: Generate smmu node in header

Also make device trees more consistent between zynqmp
and ultra96.

Signed-off-by: Robbie VanVossen <robert.vanvossen@dornerworks.com>
---
 src/plat/zynqmp/overlay-zynqmp.dts |  3 ++-
 tools/dts/ultra96v2.dts            | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/plat/zynqmp/overlay-zynqmp.dts b/src/plat/zynqmp/overlay-zynqmp.dts
index e644b2e6c..779b1585b 100644
--- a/src/plat/zynqmp/overlay-zynqmp.dts
+++ b/src/plat/zynqmp/overlay-zynqmp.dts
@@ -33,6 +33,7 @@
 		seL4,kernel-devices =
 		    "serial0",
 		    &{/amba_apu@0/interrupt-controller@f9010000},
-		    &{/timer};
+		    &{/timer},
+		    &{/amba/smmu@fd800000};
     };
 };
diff --git a/tools/dts/ultra96v2.dts b/tools/dts/ultra96v2.dts
index c2113a7fd..f3f93fa3f 100644
--- a/tools/dts/ultra96v2.dts
+++ b/tools/dts/ultra96v2.dts
@@ -337,17 +337,6 @@
 		};
 	};
 
-	smmu@fd800000 {
-		compatible = "arm,mmu-500";
-		reg = <0x0 0xfd800000 0x0 0x20000>;
-		#iommu-cells = <0x1>;
-		status = "disabled";
-		#global-interrupts = <0x1>;
-		interrupt-parent = <0x4>;
-		interrupts = <0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4>;
-		phandle = <0xd>;
-	};
-
 	amba {
 		compatible = "simple-bus";
 		u-boot,dm-pre-reloc;
@@ -355,6 +344,17 @@
 		#size-cells = <0x2>;
 		ranges;
 
+		smmu@fd800000 {
+			compatible = "arm,mmu-500";
+			reg = <0x0 0xfd800000 0x0 0x20000>;
+			#iommu-cells = <0x1>;
+			status = "disabled";
+			#global-interrupts = <0x1>;
+			interrupt-parent = <0x4>;
+			interrupts = <0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4 0x0 0x9b 0x4>;
+			phandle = <0xd>;
+		};
+
 		can@ff060000 {
 			compatible = "xlnx,zynq-can-1.0";
 			status = "disabled";