Skip to content

Commit c5fb66a

Browse files
committed
Merge branch 'for-joerg/arm-smmu/bindings' into for-joerg/arm-smmu/updates
Updates to the Arm SMMU device-tree bindings. * for-joerg/arm-smmu/bindings: dt-bindings: arm-smmu: Add SDX75 SMMU compatible dt-bindings: arm-smmu: Add SM6375 GPU SMMU dt-bindings: iommu: arm,smmu: enable clocks for sa8775p Adreno SMMU dt-bindings: arm-smmu: Fix SC8280XP Adreno binding
2 parents 6833b8f + 48989c0 commit c5fb66a

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ properties:
2929
- qcom,msm8996-smmu-v2
3030
- qcom,msm8998-smmu-v2
3131
- qcom,sdm630-smmu-v2
32+
- qcom,sm6375-smmu-v2
3233
- const: qcom,smmu-v2
3334

3435
- description: Qcom SoCs implementing "qcom,smmu-500" and "arm,mmu-500"
@@ -45,6 +46,7 @@ properties:
4546
- qcom,sdm845-smmu-500
4647
- qcom,sdx55-smmu-500
4748
- qcom,sdx65-smmu-500
49+
- qcom,sdx75-smmu-500
4850
- qcom,sm6115-smmu-500
4951
- qcom,sm6125-smmu-500
5052
- qcom,sm6350-smmu-500
@@ -79,7 +81,9 @@ properties:
7981
- description: Qcom Adreno GPUs implementing "qcom,smmu-500" and "arm,mmu-500"
8082
items:
8183
- enum:
84+
- qcom,sa8775p-smmu-500
8285
- qcom,sc7280-smmu-500
86+
- qcom,sc8280xp-smmu-500
8387
- qcom,sm6115-smmu-500
8488
- qcom,sm6125-smmu-500
8589
- qcom,sm8150-smmu-500
@@ -267,6 +271,7 @@ allOf:
267271
enum:
268272
- qcom,msm8998-smmu-v2
269273
- qcom,sdm630-smmu-v2
274+
- qcom,sm6375-smmu-v2
270275
then:
271276
anyOf:
272277
- properties:
@@ -331,7 +336,10 @@ allOf:
331336
properties:
332337
compatible:
333338
contains:
334-
const: qcom,sc7280-smmu-500
339+
enum:
340+
- qcom,sa8775p-smmu-500
341+
- qcom,sc7280-smmu-500
342+
- qcom,sc8280xp-smmu-500
335343
then:
336344
properties:
337345
clock-names:
@@ -413,10 +421,8 @@ allOf:
413421
- nvidia,smmu-500
414422
- qcom,qcm2290-smmu-500
415423
- qcom,qdu1000-smmu-500
416-
- qcom,sa8775p-smmu-500
417424
- qcom,sc7180-smmu-500
418425
- qcom,sc8180x-smmu-500
419-
- qcom,sc8280xp-smmu-500
420426
- qcom,sdm670-smmu-500
421427
- qcom,sdm845-smmu-500
422428
- qcom,sdx55-smmu-500

0 commit comments

Comments
 (0)