diff options
| author | Joerg Roedel <joro@8bytes.org> | 2014-03-04 14:54:27 +0100 |
|---|---|---|
| committer | Joerg Roedel <joro@8bytes.org> | 2014-03-04 14:54:27 +0100 |
| commit | dc03753b98e21d73699c38b208ad39d9839519ee (patch) | |
| tree | 0b7bbfba26ea0c75098c0276897653f6a87fb6fa /Documentation | |
| parent | 0414855fdc4a40da05221fc6062cccbc0c30f169 (diff) | |
| parent | 34fb4b37b7b6da7dc34797d1abf234dd30b091d8 (diff) | |
| download | linux-0-day-dc03753b98e21d73699c38b208ad39d9839519ee.tar.gz linux-0-day-dc03753b98e21d73699c38b208ad39d9839519ee.tar.xz | |
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')
| -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 e34c6cdd8ba8f..f284b99402bc3 100644 --- a/Documentation/devicetree/bindings/iommu/arm,smmu.txt +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.txt @@ -48,6 +48,12 @@ conditions. 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 + aliases of secure registers have to be used during + SMMU configuration. + Example: smmu { |