diff options
| author | Will Deacon <will@kernel.org> | 2024-07-04 15:13:48 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2024-07-04 15:13:48 +0100 |
| commit | a4ce399973d21494eab12e7049f38d47c0c4cb30 (patch) | |
| tree | 6e0ae1799cab6e7a6b15087ff19a202d4a707fb9 | |
| parent | c3f38fa61af77b49866b006939479069cd451173 (diff) | |
| parent | d6c102881b302697802547d6abb6f24a49c79f2b (diff) | |
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
| -rw-r--r-- | Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml index 5c130cf06a21..280b4e49f219 100644 --- a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml @@ -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 |