From: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Date: Thu, 26 Nov 2015 13:12:20 +0000 (+0100)
Subject: ARM64: zynqmp: Hook up the GEMs to the SMMU
X-Git-Tag: v2016.05-rc2~64^2~40
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7f1d7d974bf6a969447212c2c9bc65d77dcf7d67;p=u-boot

ARM64: zynqmp: Hook up the GEMs to the SMMU

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi
index 4cfecec85a..66abe6fe0b 100644
--- a/arch/arm/dts/zynqmp.dtsi
+++ b/arch/arm/dts/zynqmp.dtsi
@@ -310,6 +310,7 @@
 			clock-names = "pclk", "hclk", "tx_clk";
 			#address-cells = <1>;
 			#size-cells = <0>;
+			#stream-id-cells = <1>;
 			jumbo-max-len = <10240>;
 			jumbo-supported;
 		};
@@ -323,6 +324,7 @@
 			clock-names = "pclk", "hclk", "tx_clk";
 			#address-cells = <1>;
 			#size-cells = <0>;
+			#stream-id-cells = <1>;
 			jumbo-max-len = <10240>;
 			jumbo-supported;
 		};
@@ -336,6 +338,7 @@
 			clock-names = "pclk", "hclk", "tx_clk";
 			#address-cells = <1>;
 			#size-cells = <0>;
+			#stream-id-cells = <1>;
 			jumbo-max-len = <10240>;
 			jumbo-supported;
 		};
@@ -349,6 +352,7 @@
 			clock-names = "pclk", "hclk", "tx_clk";
 			#address-cells = <1>;
 			#size-cells = <0>;
+			#stream-id-cells = <1>;
 			jumbo-max-len = <10240>;
 			jumbo-supported;
 		};
@@ -459,6 +463,10 @@
 				<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>;
+			mmu-masters = < &gem0 0x874
+					&gem1 0x875
+					&gem2 0x876
+					&gem3 0x877 >;
 		};
 
 		spi0: spi@ff040000 {