Skip to content

Commit ca08b2a

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: Document SM61[12]5 GPU SMMU dt-bindings: arm-smmu: Add SM8350 Adreno SMMU dt-bindings: arm-smmu: Use qcom,smmu compatible for MMU500 adreno SMMUs dt-bindings: arm-smmu: Add compatible for SM8550 SoC
2 parents 67ea0b7 + 3ad6585 commit ca08b2a

1 file changed

Lines changed: 41 additions & 4 deletions

File tree

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

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ properties:
5353
- qcom,sm8250-smmu-500
5454
- qcom,sm8350-smmu-500
5555
- qcom,sm8450-smmu-500
56+
- qcom,sm8550-smmu-500
5657
- const: qcom,smmu-500
5758
- const: arm,mmu-500
5859

@@ -75,9 +76,22 @@ properties:
7576
- qcom,sm8350-smmu-500
7677
- qcom,sm8450-smmu-500
7778
- const: arm,mmu-500
78-
79-
- description: Qcom Adreno GPUs implementing "arm,smmu-500"
79+
- description: Qcom Adreno GPUs implementing "qcom,smmu-500" and "arm,mmu-500"
80+
items:
81+
- enum:
82+
- qcom,sc7280-smmu-500
83+
- qcom,sm6115-smmu-500
84+
- qcom,sm6125-smmu-500
85+
- qcom,sm8150-smmu-500
86+
- qcom,sm8250-smmu-500
87+
- qcom,sm8350-smmu-500
88+
- const: qcom,adreno-smmu
89+
- const: qcom,smmu-500
90+
- const: arm,mmu-500
91+
- description: Qcom Adreno GPUs implementing "arm,mmu-500" (legacy binding)
92+
deprecated: true
8093
items:
94+
# Do not add additional SoC to this list. Instead use previous list.
8195
- enum:
8296
- qcom,sc7280-smmu-500
8397
- qcom,sm8150-smmu-500
@@ -364,6 +378,30 @@ allOf:
364378
- description: interface clock required to access smmu's registers
365379
through the TCU's programming interface.
366380

381+
- if:
382+
properties:
383+
compatible:
384+
items:
385+
- enum:
386+
- qcom,sm6115-smmu-500
387+
- qcom,sm6125-smmu-500
388+
- const: qcom,adreno-smmu
389+
- const: qcom,smmu-500
390+
- const: arm,mmu-500
391+
then:
392+
properties:
393+
clock-names:
394+
items:
395+
- const: mem
396+
- const: hlos
397+
- const: iface
398+
399+
clocks:
400+
items:
401+
- description: GPU memory bus clock
402+
- description: Voter clock required for HLOS SMMU access
403+
- description: Interface clock required for register access
404+
367405
# Disallow clocks for all other platforms with specific compatibles
368406
- if:
369407
properties:
@@ -383,12 +421,11 @@ allOf:
383421
- qcom,sdm845-smmu-500
384422
- qcom,sdx55-smmu-500
385423
- qcom,sdx65-smmu-500
386-
- qcom,sm6115-smmu-500
387-
- qcom,sm6125-smmu-500
388424
- qcom,sm6350-smmu-500
389425
- qcom,sm6375-smmu-500
390426
- qcom,sm8350-smmu-500
391427
- qcom,sm8450-smmu-500
428+
- qcom,sm8550-smmu-500
392429
then:
393430
properties:
394431
clock-names: false

0 commit comments

Comments
 (0)