diff options
| author | Joerg Roedel <jroedel@suse.de> | 2023-09-25 12:34:53 +0300 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2023-09-25 12:34:53 +0300 |
| commit | 7accef5353746caf75a70e9d6f2ac257f247bd78 (patch) | |
| tree | 2b139f77cca221c8755fd6f94bcc4035524b4808 /Documentation | |
| parent | b07eba71a512eb196cbcc29765c29c8c29b11b59 (diff) | |
| parent | d5afb4b47e13161b3f33904d45110f9e6463bad6 (diff) | |
| download | linux-7accef5353746caf75a70e9d6f2ac257f247bd78.tar.xz | |
Merge tag 'arm-smmu-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into iommu/fixes
Arm SMMU fixes for 6.6 -rc
- Fix TLB range command encoding when TTL, Num and Scale are all zero
- Fix soft lockup by limiting TLB invalidation ops issued by SVA
- Fix clocks description for SDM630 platform in arm-smmu DT binding
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml index cf29ab10501c..b1b2cf81b42f 100644 --- a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml @@ -270,6 +270,7 @@ allOf: contains: enum: - qcom,msm8998-smmu-v2 + - qcom,sdm630-smmu-v2 then: anyOf: - properties: @@ -311,7 +312,6 @@ allOf: compatible: contains: enum: - - qcom,sdm630-smmu-v2 - qcom,sm6375-smmu-v2 then: anyOf: |