Commit 88cb3e1d 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: Document SM8650 GPU SMMU
  dt-bindings: arm-smmu: Fix SM8[45]50 GPU SMMU 'if' condition
  dt-bindings: arm-smmu: Add QCM2290 GPU SMMU
parents 12721e66 8a05f74d

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

+16 −4
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ properties: 
      - description: Qcom Adreno GPUs implementing "qcom,smmu-500" and "arm,mmu-500"

        items:

          - enum:

              - qcom,qcm2290-smmu-500

              - qcom,sa8775p-smmu-500

              - qcom,sc7280-smmu-500

              - qcom,sc8280xp-smmu-500
@@ -93,6 +94,7 @@ properties: 
              - qcom,sm8350-smmu-500

              - qcom,sm8450-smmu-500

              - qcom,sm8550-smmu-500

              - qcom,sm8650-smmu-500

          - const: qcom,adreno-smmu

          - const: qcom,smmu-500

          - const: arm,mmu-500
@@ -462,6 +464,7 @@ allOf: 
        compatible:

          items:

            - enum:

                - qcom,qcm2290-smmu-500

                - qcom,sm6115-smmu-500

                - qcom,sm6125-smmu-500

            - const: qcom,adreno-smmu
@@ -484,7 +487,12 @@ allOf: 
  - if:

      properties:

        compatible:

          const: qcom,sm8450-smmu-500

          items:

            - const: qcom,sm8450-smmu-500

            - const: qcom,adreno-smmu

            - const: qcom,smmu-500

            - const: arm,mmu-500



    then:

      properties:

        clock-names:
@@ -508,7 +516,13 @@ allOf: 
  - if:

      properties:

        compatible:

          const: qcom,sm8550-smmu-500

          items:

            - enum:

                - qcom,sm8550-smmu-500

                - qcom,sm8650-smmu-500

            - const: qcom,adreno-smmu

            - const: qcom,smmu-500

            - const: arm,mmu-500

    then:

      properties:

        clock-names:
@@ -534,7 +548,6 @@ allOf: 
              - cavium,smmu-v2

              - marvell,ap806-smmu-500

              - nvidia,smmu-500

              - qcom,qcm2290-smmu-500

              - qcom,qdu1000-smmu-500

              - qcom,sc7180-smmu-500

              - qcom,sc8180x-smmu-500
@@ -544,7 +557,6 @@ allOf: 
              - qcom,sdx65-smmu-500

              - qcom,sm6350-smmu-500

              - qcom,sm6375-smmu-500

              - qcom,sm8650-smmu-500

              - qcom,x1e80100-smmu-500

    then:

      properties: