diff options
| author | Joerg Roedel <jroedel@suse.de> | 2014-07-10 09:28:28 -0400 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2014-07-10 09:28:28 -0400 |
| commit | a188cf8d5e3aa5d6a0d68bff72a3f1eb01dfb8c6 (patch) | |
| tree | 2bfe93f82c5bc942645871b518db446a7f529c05 /Documentation/devicetree/bindings/iommu | |
| parent | cd3de83f147601356395b57a8673e9c5ff1e59d1 (diff) | |
| parent | 2907320df3189420cb66178a86b2917f4b64018f (diff) | |
Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
Diffstat (limited to 'Documentation/devicetree/bindings/iommu')
| -rw-r--r-- | Documentation/devicetree/bindings/iommu/arm,smmu.txt | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.txt b/Documentation/devicetree/bindings/iommu/arm,smmu.txt index f284b99402bc..2d0f7cd867ea 100644 --- a/Documentation/devicetree/bindings/iommu/arm,smmu.txt +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.txt | |||
| @@ -42,12 +42,6 @@ conditions. | |||
| 42 | 42 | ||
| 43 | ** System MMU optional properties: | 43 | ** System MMU optional properties: |
| 44 | 44 | ||
| 45 | - smmu-parent : When multiple SMMUs are chained together, this | ||
| 46 | property can be used to provide a phandle to the | ||
| 47 | parent SMMU (that is the next SMMU on the path going | ||
| 48 | from the mmu-masters towards memory) node for this | ||
| 49 | SMMU. | ||
| 50 | |||
| 51 | - calxeda,smmu-secure-config-access : Enable proper handling of buggy | 45 | - calxeda,smmu-secure-config-access : Enable proper handling of buggy |
| 52 | implementations that always use secure access to | 46 | implementations that always use secure access to |
| 53 | SMMU configuration registers. In this case non-secure | 47 | SMMU configuration registers. In this case non-secure |