Commit c5fb66a1 authored by Will Deacon's avatar Will Deacon
Browse files

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
parents 6833b8f2 48989c0b

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

+9 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ properties: 
              - qcom,msm8996-smmu-v2

              - qcom,msm8998-smmu-v2

              - qcom,sdm630-smmu-v2

              - qcom,sm6375-smmu-v2

          - const: qcom,smmu-v2



      - description: Qcom SoCs implementing "qcom,smmu-500" and "arm,mmu-500"
@@ -45,6 +46,7 @@ properties: 
              - qcom,sdm845-smmu-500

              - qcom,sdx55-smmu-500

              - qcom,sdx65-smmu-500

              - qcom,sdx75-smmu-500

              - qcom,sm6115-smmu-500

              - qcom,sm6125-smmu-500

              - qcom,sm6350-smmu-500
@@ -79,7 +81,9 @@ properties: 
      - description: Qcom Adreno GPUs implementing "qcom,smmu-500" and "arm,mmu-500"

        items:

          - enum:

              - qcom,sa8775p-smmu-500

              - qcom,sc7280-smmu-500

              - qcom,sc8280xp-smmu-500

              - qcom,sm6115-smmu-500

              - qcom,sm6125-smmu-500

              - qcom,sm8150-smmu-500
@@ -267,6 +271,7 @@ allOf: 
            enum:

              - qcom,msm8998-smmu-v2

              - qcom,sdm630-smmu-v2

              - qcom,sm6375-smmu-v2

    then:

      anyOf:

        - properties:
@@ -331,7 +336,10 @@ allOf: 
      properties:

        compatible:

          contains:

            const: qcom,sc7280-smmu-500

            enum:

              - qcom,sa8775p-smmu-500

              - qcom,sc7280-smmu-500

              - qcom,sc8280xp-smmu-500

    then:

      properties:

        clock-names:
@@ -413,10 +421,8 @@ allOf: 
              - nvidia,smmu-500

              - qcom,qcm2290-smmu-500

              - qcom,qdu1000-smmu-500

              - qcom,sa8775p-smmu-500

              - qcom,sc7180-smmu-500

              - qcom,sc8180x-smmu-500

              - qcom,sc8280xp-smmu-500

              - qcom,sdm670-smmu-500

              - qcom,sdm845-smmu-500

              - qcom,sdx55-smmu-500