Skip to content

Commit a4ce399

Browse files
committed
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
2 parents c3f38fa + d6c1028 commit a4ce399

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Documentation/devicetree/bindings/iommu/arm,smmu.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ properties:
8686
- qcom,qcm2290-smmu-500
8787
- qcom,sa8775p-smmu-500
8888
- qcom,sc7280-smmu-500
89+
- qcom,sc8180x-smmu-500
8990
- qcom,sc8280xp-smmu-500
9091
- qcom,sm6115-smmu-500
9192
- qcom,sm6125-smmu-500
@@ -95,6 +96,7 @@ properties:
9596
- qcom,sm8450-smmu-500
9697
- qcom,sm8550-smmu-500
9798
- qcom,sm8650-smmu-500
99+
- qcom,x1e80100-smmu-500
98100
- const: qcom,adreno-smmu
99101
- const: qcom,smmu-500
100102
- const: arm,mmu-500
@@ -415,6 +417,7 @@ allOf:
415417
compatible:
416418
contains:
417419
enum:
420+
- qcom,sc8180x-smmu-500
418421
- qcom,sm6350-smmu-v2
419422
- qcom,sm7150-smmu-v2
420423
- qcom,sm8150-smmu-500
@@ -520,6 +523,7 @@ allOf:
520523
- enum:
521524
- qcom,sm8550-smmu-500
522525
- qcom,sm8650-smmu-500
526+
- qcom,x1e80100-smmu-500
523527
- const: qcom,adreno-smmu
524528
- const: qcom,smmu-500
525529
- const: arm,mmu-500
@@ -550,14 +554,12 @@ allOf:
550554
- nvidia,smmu-500
551555
- qcom,qdu1000-smmu-500
552556
- qcom,sc7180-smmu-500
553-
- qcom,sc8180x-smmu-500
554557
- qcom,sdm670-smmu-500
555558
- qcom,sdm845-smmu-500
556559
- qcom,sdx55-smmu-500
557560
- qcom,sdx65-smmu-500
558561
- qcom,sm6350-smmu-500
559562
- qcom,sm6375-smmu-500
560-
- qcom,x1e80100-smmu-500
561563
then:
562564
properties:
563565
clock-names: false

0 commit comments

Comments
 (0)