diff options
| author | Joerg Roedel | 2015-08-07 10:07:24 +0200 |
|---|---|---|
| committer | Joerg Roedel | 2015-08-07 10:07:24 +0200 |
| commit | f968393161de7612800ea650d435ebe26d38e3a5 (patch) | |
| tree | c9d64314357effc22a0989c228ff970f85dbba81 /Documentation/devicetree | |
| parent | Linux 4.2-rc5 (diff) | |
| parent | iommu/io-pgtable: Remove flush_pgtable callback (diff) | |
| download | kernel-qcow2-linux-f968393161de7612800ea650d435ebe26d38e3a5.tar.gz kernel-qcow2-linux-f968393161de7612800ea650d435ebe26d38e3a5.tar.xz kernel-qcow2-linux-f968393161de7612800ea650d435ebe26d38e3a5.zip | |
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')
| -rw-r--r-- | Documentation/devicetree/bindings/iommu/arm,smmu.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.txt b/Documentation/devicetree/bindings/iommu/arm,smmu.txt index 06760503a819..718074501fcb 100644 --- a/Documentation/devicetree/bindings/iommu/arm,smmu.txt +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.txt @@ -43,6 +43,12 @@ conditions. ** System MMU optional properties: +- dma-coherent : Present if page table walks made by the SMMU are + cache coherent with the CPU. + + NOTE: this only applies to the SMMU itself, not + masters connected upstream of the 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 |