diff options
author | Joerg Roedel <jroedel@suse.de> | 2023-10-16 09:33:07 +0200 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2023-10-16 09:33:07 +0200 |
commit | aa5cabc4ce8e6b45d170d162dc54b1bac1767c47 (patch) | |
tree | a29c700199aea9ea9b3be4b31c92ff394d9ae66d /Documentation | |
parent | Linux 6.6-rc3 (diff) | |
parent | Merge branch 'for-joerg/arm-smmu/bindings' into for-joerg/arm-smmu/updates (diff) | |
download | linux-aa5cabc4ce8e6b45d170d162dc54b1bac1767c47.tar.xz linux-aa5cabc4ce8e6b45d170d162dc54b1bac1767c47.zip |
Merge tag 'arm-smmu-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
Arm SMMU updates for 6.7
- Device-tree binding update:
* Add qcom,sm7150-smmu-v2 for Adreno on SM7150 SoC
- SMMUv2:
* Support for Qualcomm SDM670 (MDSS) and SM7150 SoCs
- SMMUv3:
* Large refactoring of the context descriptor code to
move the CD table into the master, paving the way
for '->set_dev_pasid()' support on non-SVA domains
* Minor cleanups to the SVA code
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml index cf29ab10501c..aa9e1c0895a5 100644 --- a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml @@ -110,6 +110,7 @@ properties: - qcom,sdm630-smmu-v2 - qcom,sdm845-smmu-v2 - qcom,sm6350-smmu-v2 + - qcom,sm7150-smmu-v2 - const: qcom,adreno-smmu - const: qcom,smmu-v2 - description: Qcom Adreno GPUs on Google Cheza platform @@ -270,6 +271,7 @@ allOf: contains: enum: - qcom,msm8998-smmu-v2 + - qcom,sdm630-smmu-v2 then: anyOf: - properties: @@ -311,7 +313,6 @@ allOf: compatible: contains: enum: - - qcom,sdm630-smmu-v2 - qcom,sm6375-smmu-v2 then: anyOf: @@ -409,6 +410,7 @@ allOf: contains: enum: - qcom,sm6350-smmu-v2 + - qcom,sm7150-smmu-v2 - qcom,sm8150-smmu-500 - qcom,sm8250-smmu-500 then: |