---

yaml --- r: 355592 b: refs/heads/master c: 2da1396 h: refs/heads/master v: v3
git-mirror · Jan 29, 2013 · a300edb · a300edb
1 parent 0c0aaac
commit a300edb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0dfe42edcc0a30c21c9bbcfc8a5ad91fb49c2dfb
+refs/heads/master: 2da139657b108ab4485640178dd4d7f3ca931065
diff --git a/trunk/arch/arm/boot/dts/tegra114.dtsi b/trunk/arch/arm/boot/dts/tegra114.dtsi
@@ -80,6 +80,17 @@
 		reg = <0x7000e400 0x400>;
 	};
 
+	iommu {
+		compatible = "nvidia,tegra114-smmu", "nvidia,tegra30-smmu";
+		reg = <0x7000f010 0x02c
+		       0x7000f1f0 0x010
+		       0x7000f228 0x074>;
+		nvidia,#asids = <4>;
+		dma-window = <0 0x40000000>;
+		nvidia,swgroups = <0x18659fe>;
+		nvidia,ahb = <&ahb>;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;