Commit 54865092 authored by Will Deacon's avatar Will Deacon

Merge branch 'for-joerg/arm-smmu/bindings' into for-joerg/arm-smmu/updates

Update to the Arm SMMU device-tree bindings.

* for-joerg/arm-smmu/bindings:
  dt-bindings: arm-smmu: Add SM7150 GPU SMMUv2
parents 37ed3644 c53cdc02
...@@ -110,6 +110,7 @@ properties: ...@@ -110,6 +110,7 @@ properties:
- qcom,sdm630-smmu-v2 - qcom,sdm630-smmu-v2
- qcom,sdm845-smmu-v2 - qcom,sdm845-smmu-v2
- qcom,sm6350-smmu-v2 - qcom,sm6350-smmu-v2
- qcom,sm7150-smmu-v2
- const: qcom,adreno-smmu - const: qcom,adreno-smmu
- const: qcom,smmu-v2 - const: qcom,smmu-v2
- description: Qcom Adreno GPUs on Google Cheza platform - description: Qcom Adreno GPUs on Google Cheza platform
...@@ -409,6 +410,7 @@ allOf: ...@@ -409,6 +410,7 @@ allOf:
contains: contains:
enum: enum:
- qcom,sm6350-smmu-v2 - qcom,sm6350-smmu-v2
- qcom,sm7150-smmu-v2
- qcom,sm8150-smmu-500 - qcom,sm8150-smmu-500
- qcom,sm8250-smmu-500 - qcom,sm8250-smmu-500
then: then:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment