Commit a4ce3999 authored by Will Deacon's avatar Will Deacon

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

* for-joerg/arm-smmu/bindings:
  dt-bindings: arm-smmu: Add X1E80100 GPU SMMU
  dt-bindings: arm-smmu: Fix Qualcomm SC8180X binding
parents c3f38fa6 d6c10288
...@@ -86,6 +86,7 @@ properties: ...@@ -86,6 +86,7 @@ properties:
- qcom,qcm2290-smmu-500 - qcom,qcm2290-smmu-500
- qcom,sa8775p-smmu-500 - qcom,sa8775p-smmu-500
- qcom,sc7280-smmu-500 - qcom,sc7280-smmu-500
- qcom,sc8180x-smmu-500
- qcom,sc8280xp-smmu-500 - qcom,sc8280xp-smmu-500
- qcom,sm6115-smmu-500 - qcom,sm6115-smmu-500
- qcom,sm6125-smmu-500 - qcom,sm6125-smmu-500
...@@ -95,6 +96,7 @@ properties: ...@@ -95,6 +96,7 @@ properties:
- qcom,sm8450-smmu-500 - qcom,sm8450-smmu-500
- qcom,sm8550-smmu-500 - qcom,sm8550-smmu-500
- qcom,sm8650-smmu-500 - qcom,sm8650-smmu-500
- qcom,x1e80100-smmu-500
- const: qcom,adreno-smmu - const: qcom,adreno-smmu
- const: qcom,smmu-500 - const: qcom,smmu-500
- const: arm,mmu-500 - const: arm,mmu-500
...@@ -415,6 +417,7 @@ allOf: ...@@ -415,6 +417,7 @@ allOf:
compatible: compatible:
contains: contains:
enum: enum:
- qcom,sc8180x-smmu-500
- qcom,sm6350-smmu-v2 - qcom,sm6350-smmu-v2
- qcom,sm7150-smmu-v2 - qcom,sm7150-smmu-v2
- qcom,sm8150-smmu-500 - qcom,sm8150-smmu-500
...@@ -520,6 +523,7 @@ allOf: ...@@ -520,6 +523,7 @@ allOf:
- enum: - enum:
- qcom,sm8550-smmu-500 - qcom,sm8550-smmu-500
- qcom,sm8650-smmu-500 - qcom,sm8650-smmu-500
- qcom,x1e80100-smmu-500
- const: qcom,adreno-smmu - const: qcom,adreno-smmu
- const: qcom,smmu-500 - const: qcom,smmu-500
- const: arm,mmu-500 - const: arm,mmu-500
...@@ -550,14 +554,12 @@ allOf: ...@@ -550,14 +554,12 @@ allOf:
- nvidia,smmu-500 - nvidia,smmu-500
- qcom,qdu1000-smmu-500 - qcom,qdu1000-smmu-500
- qcom,sc7180-smmu-500 - qcom,sc7180-smmu-500
- qcom,sc8180x-smmu-500
- qcom,sdm670-smmu-500 - qcom,sdm670-smmu-500
- qcom,sdm845-smmu-500 - qcom,sdm845-smmu-500
- qcom,sdx55-smmu-500 - qcom,sdx55-smmu-500
- qcom,sdx65-smmu-500 - qcom,sdx65-smmu-500
- qcom,sm6350-smmu-500 - qcom,sm6350-smmu-500
- qcom,sm6375-smmu-500 - qcom,sm6375-smmu-500
- qcom,x1e80100-smmu-500
then: then:
properties: properties:
clock-names: false clock-names: false
......
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