diff options
| author | Will Deacon <will@kernel.org> | 2024-11-05 13:05:04 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2024-11-05 13:05:04 +0000 |
| commit | 896de2a8f9d3b24d84df0140fe3485089cb61333 (patch) | |
| tree | 7c1270c179daf4e6eefe1de63eed1f7ac21aaefe | |
| parent | 5492f0c4085a8fb8820ff974f17b83a7d6dab5a5 (diff) | |
| parent | 515c8ff024ba41c66c2faaafaabd194e95c0a75c (diff) | |
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
| -rw-r--r-- | Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml index 92d350b8e01a..c1e11bc6b7a0 100644 --- a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml @@ -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 |