Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub…

…/scm/linux/kernel/git/will/linux into arm/smmu
git-mirror · Jul 10, 2014 · a188cf8 · a188cf8
2 parents cd3de83 + 2907320
commit a188cf8
Show file tree

Hide file tree

Showing 2 changed files with 240 additions and 259 deletions.
diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.txt b/Documentation/devicetree/bindings/iommu/arm,smmu.txt
@@ -42,12 +42,6 @@ conditions.
 
 ** System MMU optional properties:
 
-- smmu-parent   : When multiple SMMUs are chained together, this
-                  property can be used to provide a phandle to the
-                  parent SMMU (that is the next SMMU on the path going
-                  from the mmu-masters towards memory) node for this
-                  SMMU.
-
 - calxeda,smmu-secure-config-access : Enable proper handling of buggy
                   implementations that always use secure access to
                   SMMU configuration registers. In this case non-secure