Commit 896de2a8 authored by Will Deacon's avatar Will Deacon
Browse files

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

* for-joerg/arm-smmu/bindings:
  dt-bindings: arm-smmu: document QCS615 APPS SMMU
  dt-bindings: iommu: arm,smmu: Add Qualcomm SAR2130P compatible
parents 5492f0c4 515c8ff0

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

+5 −0
Original line number Diff line number Diff line
@@ -36,10 +36,12 @@ properties: 
        items:

          - enum:

              - qcom,qcm2290-smmu-500

              - qcom,qcs615-smmu-500

              - qcom,qcs8300-smmu-500

              - qcom,qdu1000-smmu-500

              - qcom,sa8255p-smmu-500

              - qcom,sa8775p-smmu-500

              - qcom,sar2130p-smmu-500

              - qcom,sc7180-smmu-500

              - qcom,sc7280-smmu-500

              - qcom,sc8180x-smmu-500
@@ -88,6 +90,7 @@ properties: 
              - qcom,qcm2290-smmu-500

              - qcom,sa8255p-smmu-500

              - qcom,sa8775p-smmu-500

              - qcom,sar2130p-smmu-500

              - qcom,sc7280-smmu-500

              - qcom,sc8180x-smmu-500

              - qcom,sc8280xp-smmu-500
@@ -524,6 +527,7 @@ allOf: 
        compatible:

          items:

            - enum:

                - qcom,sar2130p-smmu-500

                - qcom,sm8550-smmu-500

                - qcom,sm8650-smmu-500

                - qcom,x1e80100-smmu-500
@@ -555,6 +559,7 @@ allOf: 
              - cavium,smmu-v2

              - marvell,ap806-smmu-500

              - nvidia,smmu-500

              - qcom,qcs615-smmu-500

              - qcom,qcs8300-smmu-500

              - qcom,qdu1000-smmu-500

              - qcom,sa8255p-smmu-500