Commit afe92fbf 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: Fix MSM8998 clocks description
  dt-bindings: iommu: qcom,iommu: Add QSMMUv2 and MSM8976 compatibles
  dt-bindings: iommu: qcom,iommu: Add qcom,ctx-asid property
parents 757d591d b606e2e8

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

+41 −0
Original line number Diff line number Diff line
@@ -270,6 +270,47 @@ allOf: 
          contains:

            enum:

              - qcom,msm8998-smmu-v2

    then:

      anyOf:

        - properties:

            clock-names:

              items:

                - const: bus

            clocks:

              items:

                - description: bus clock required for downstream bus access and for

                    the smmu ptw

        - properties:

            clock-names:

              items:

                - const: iface

                - const: mem

                - const: mem_iface

            clocks:

              items:

                - description: interface clock required to access smmu's registers

                    through the TCU's programming interface.

                - description: bus clock required for memory access

                - description: bus clock required for GPU memory access

        - properties:

            clock-names:

              items:

                - const: iface-mm

                - const: iface-smmu

                - const: bus-smmu

            clocks:

              items:

                - description: interface clock required to access mnoc's registers

                    through the TCU's programming interface.

                - description: interface clock required to access smmu's registers

                    through the TCU's programming interface.

                - description: bus clock required for the smmu ptw



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,sdm630-smmu-v2

              - qcom,sm6375-smmu-v2

    then:

Documentation/devicetree/bindings/iommu/qcom,iommu.yaml

+17 −5
Original line number Diff line number Diff line
@@ -17,11 +17,16 @@ description: | 


properties:

  compatible:

    items:

    oneOf:

      - items:

          - enum:

              - qcom,msm8916-iommu

              - qcom,msm8953-iommu

          - const: qcom,msm-iommu-v1

      - items:

          - enum:

              - qcom,msm8976-iommu

          - const: qcom,msm-iommu-v2



  clocks:

    items:
@@ -64,6 +69,8 @@ patternProperties: 
        enum:

          - qcom,msm-iommu-v1-ns

          - qcom,msm-iommu-v1-sec

          - qcom,msm-iommu-v2-ns

          - qcom,msm-iommu-v2-sec



      interrupts:

        maxItems: 1
@@ -71,6 +78,11 @@ patternProperties: 
      reg:

        maxItems: 1



      qcom,ctx-asid:

        $ref: /schemas/types.yaml#/definitions/uint32

        description:

          The ASID number associated to the context bank.



    required:

      - compatible

      - interrupts