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

Merge branch 'for-joerg/arm-smmu/bindings' into for-joerg/arm-smmu/next 

* for-joerg/arm-smmu/bindings:
  dt-bindings: arm-smmu: Add X1E80100 GPU SMMU
  dt-bindings: arm-smmu: Fix Qualcomm SC8180X binding
parents c3f38fa6 d6c10288

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

+4 −2
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ properties: 
              - qcom,qcm2290-smmu-500

              - qcom,sa8775p-smmu-500

              - qcom,sc7280-smmu-500

              - qcom,sc8180x-smmu-500

              - qcom,sc8280xp-smmu-500

              - qcom,sm6115-smmu-500

              - qcom,sm6125-smmu-500
@@ -95,6 +96,7 @@ properties: 
              - qcom,sm8450-smmu-500

              - qcom,sm8550-smmu-500

              - qcom,sm8650-smmu-500

              - qcom,x1e80100-smmu-500

          - const: qcom,adreno-smmu

          - const: qcom,smmu-500

          - const: arm,mmu-500
@@ -415,6 +417,7 @@ allOf: 
        compatible:

          contains:

            enum:

              - qcom,sc8180x-smmu-500

              - qcom,sm6350-smmu-v2

              - qcom,sm7150-smmu-v2

              - qcom,sm8150-smmu-500
@@ -520,6 +523,7 @@ allOf: 
            - enum:

                - qcom,sm8550-smmu-500

                - qcom,sm8650-smmu-500

                - qcom,x1e80100-smmu-500

            - const: qcom,adreno-smmu

            - const: qcom,smmu-500

            - const: arm,mmu-500
@@ -550,14 +554,12 @@ allOf: 
              - nvidia,smmu-500

              - qcom,qdu1000-smmu-500

              - qcom,sc7180-smmu-500

              - qcom,sc8180x-smmu-500

              - qcom,sdm670-smmu-500

              - qcom,sdm845-smmu-500

              - qcom,sdx55-smmu-500

              - qcom,sdx65-smmu-500

              - qcom,sm6350-smmu-500

              - qcom,sm6375-smmu-500

              - qcom,x1e80100-smmu-500

    then:

      properties:

        clock-names: false