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

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

Update to the Arm SMMU device-tree bindings.

* for-joerg/arm-smmu/bindings:
  dt-bindings: arm-smmu: Add SM7150 GPU SMMUv2
parents 37ed3644 c53cdc02

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

+2 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ properties: 
              - qcom,sdm630-smmu-v2

              - qcom,sdm845-smmu-v2

              - qcom,sm6350-smmu-v2

              - qcom,sm7150-smmu-v2

          - const: qcom,adreno-smmu

          - const: qcom,smmu-v2

      - description: Qcom Adreno GPUs on Google Cheza platform
@@ -409,6 +410,7 @@ allOf: 
          contains:

            enum:

              - qcom,sm6350-smmu-v2

              - qcom,sm7150-smmu-v2

              - qcom,sm8150-smmu-500

              - qcom,sm8250-smmu-500

    then: