Skip to content

Commit 1343121

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 SM8[45]50 GPU SMMU dt-bindings: arm-smmu: Add compatible for X1E80100 SoC dt-bindings: iommu: arm,smmu: document the SM8650 System MMU dt-bindings: iommu: arm,smmu: document clocks for the SM8350 GPU SMMU
2 parents 9b3febc + 4fff78d commit 1343121

1 file changed

Lines changed: 74 additions & 3 deletions

File tree

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

Lines changed: 74 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ properties:
5656
- qcom,sm8350-smmu-500
5757
- qcom,sm8450-smmu-500
5858
- qcom,sm8550-smmu-500
59+
- qcom,sm8650-smmu-500
60+
- qcom,x1e80100-smmu-500
5961
- const: qcom,smmu-500
6062
- const: arm,mmu-500
6163

@@ -89,6 +91,8 @@ properties:
8991
- qcom,sm8150-smmu-500
9092
- qcom,sm8250-smmu-500
9193
- qcom,sm8350-smmu-500
94+
- qcom,sm8450-smmu-500
95+
- qcom,sm8550-smmu-500
9296
- const: qcom,adreno-smmu
9397
- const: qcom,smmu-500
9498
- const: arm,mmu-500
@@ -429,6 +433,30 @@ allOf:
429433
- description: interface clock required to access smmu's registers
430434
through the TCU's programming interface.
431435

436+
- if:
437+
properties:
438+
compatible:
439+
items:
440+
- enum:
441+
- qcom,sm8350-smmu-500
442+
- const: qcom,adreno-smmu
443+
- const: qcom,smmu-500
444+
- const: arm,mmu-500
445+
then:
446+
properties:
447+
clock-names:
448+
items:
449+
- const: bus
450+
- const: iface
451+
- const: ahb
452+
- const: hlos1_vote_gpu_smmu
453+
- const: cx_gmu
454+
- const: hub_cx_int
455+
- const: hub_aon
456+
clocks:
457+
minItems: 7
458+
maxItems: 7
459+
432460
- if:
433461
properties:
434462
compatible:
@@ -453,6 +481,50 @@ allOf:
453481
- description: Voter clock required for HLOS SMMU access
454482
- description: Interface clock required for register access
455483

484+
- if:
485+
properties:
486+
compatible:
487+
const: qcom,sm8450-smmu-500
488+
then:
489+
properties:
490+
clock-names:
491+
items:
492+
- const: gmu
493+
- const: hub
494+
- const: hlos
495+
- const: bus
496+
- const: iface
497+
- const: ahb
498+
499+
clocks:
500+
items:
501+
- description: GMU clock
502+
- description: GPU HUB clock
503+
- description: HLOS vote clock
504+
- description: GPU memory bus clock
505+
- description: GPU SNoC bus clock
506+
- description: GPU AHB clock
507+
508+
- if:
509+
properties:
510+
compatible:
511+
const: qcom,sm8550-smmu-500
512+
then:
513+
properties:
514+
clock-names:
515+
items:
516+
- const: hlos
517+
- const: bus
518+
- const: iface
519+
- const: ahb
520+
521+
clocks:
522+
items:
523+
- description: HLOS vote clock
524+
- description: GPU memory bus clock
525+
- description: GPU SNoC bus clock
526+
- description: GPU AHB clock
527+
456528
# Disallow clocks for all other platforms with specific compatibles
457529
- if:
458530
properties:
@@ -472,9 +544,8 @@ allOf:
472544
- qcom,sdx65-smmu-500
473545
- qcom,sm6350-smmu-500
474546
- qcom,sm6375-smmu-500
475-
- qcom,sm8350-smmu-500
476-
- qcom,sm8450-smmu-500
477-
- qcom,sm8550-smmu-500
547+
- qcom,sm8650-smmu-500
548+
- qcom,x1e80100-smmu-500
478549
then:
479550
properties:
480551
clock-names: false

0 commit comments

Comments
 (0)