Commit ca08b2a6 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 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
parents 67ea0b7c 3ad65855

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

+41 −4
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ properties: 
              - qcom,sm8250-smmu-500

              - qcom,sm8350-smmu-500

              - qcom,sm8450-smmu-500

              - qcom,sm8550-smmu-500

          - const: qcom,smmu-500

          - const: arm,mmu-500
@@ -75,9 +76,22 @@ properties: 
              - qcom,sm8350-smmu-500

              - qcom,sm8450-smmu-500

          - const: arm,mmu-500



      - description: Qcom Adreno GPUs implementing "arm,smmu-500"

      - description: Qcom Adreno GPUs implementing "qcom,smmu-500" and "arm,mmu-500"

        items:

          - enum:

              - qcom,sc7280-smmu-500

              - qcom,sm6115-smmu-500

              - qcom,sm6125-smmu-500

              - qcom,sm8150-smmu-500

              - qcom,sm8250-smmu-500

              - qcom,sm8350-smmu-500

          - const: qcom,adreno-smmu

          - const: qcom,smmu-500

          - const: arm,mmu-500

      - description: Qcom Adreno GPUs implementing "arm,mmu-500" (legacy binding)

        deprecated: true

        items:

          # Do not add additional SoC to this list. Instead use previous list.

          - enum:

              - qcom,sc7280-smmu-500

              - qcom,sm8150-smmu-500
@@ -364,6 +378,30 @@ allOf: 
            - description: interface clock required to access smmu's registers

                through the TCU's programming interface.



  - if:

      properties:

        compatible:

          items:

            - enum:

                - qcom,sm6115-smmu-500

                - qcom,sm6125-smmu-500

            - const: qcom,adreno-smmu

            - const: qcom,smmu-500

            - const: arm,mmu-500

    then:

      properties:

        clock-names:

          items:

            - const: mem

            - const: hlos

            - const: iface



        clocks:

          items:

            - description: GPU memory bus clock

            - description: Voter clock required for HLOS SMMU access

            - description: Interface clock required for register access



  # Disallow clocks for all other platforms with specific compatibles

  - if:

      properties:
@@ -383,12 +421,11 @@ allOf: 
              - qcom,sdm845-smmu-500

              - qcom,sdx55-smmu-500

              - qcom,sdx65-smmu-500

              - qcom,sm6115-smmu-500

              - qcom,sm6125-smmu-500

              - qcom,sm6350-smmu-500

              - qcom,sm6375-smmu-500

              - qcom,sm8350-smmu-500

              - qcom,sm8450-smmu-500

              - qcom,sm8550-smmu-500

    then:

      properties:

        clock-names: false