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

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

* for-joerg/arm-smmu/bindings:
  dt-bindings: arm-smmu: Add compatible for QCS8300 SoC
  dt-bindings: arm-smmu: document the support on SA8255p
parents e3b1be2e 4638a047

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

+5 −0
Original line number Diff line number Diff line
@@ -36,7 +36,9 @@ properties: 
        items:

          - enum:

              - qcom,qcm2290-smmu-500

              - qcom,qcs8300-smmu-500

              - qcom,qdu1000-smmu-500

              - qcom,sa8255p-smmu-500

              - qcom,sa8775p-smmu-500

              - qcom,sc7180-smmu-500

              - qcom,sc7280-smmu-500
@@ -84,6 +86,7 @@ properties: 
        items:

          - enum:

              - qcom,qcm2290-smmu-500

              - qcom,sa8255p-smmu-500

              - qcom,sa8775p-smmu-500

              - qcom,sc7280-smmu-500

              - qcom,sc8180x-smmu-500
@@ -552,7 +555,9 @@ allOf: 
              - cavium,smmu-v2

              - marvell,ap806-smmu-500

              - nvidia,smmu-500

              - qcom,qcs8300-smmu-500

              - qcom,qdu1000-smmu-500

              - qcom,sa8255p-smmu-500

              - qcom,sc7180-smmu-500

              - qcom,sdm670-smmu-500

              - qcom,sdm845-smmu-500