summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorBjorn Andersson <quic_bjorande@quicinc.com>2023-05-22 18:04:41 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-07-19 16:35:55 +0200
commitdcb706a93aa9d7974216ecbd57b6d632ffec31b6 (patch)
tree7586ee6cbd5e9315d36ba2ea820e7d7b220c1756 /Documentation
parent09ea1ae4a2ec17774892cfcff50f6d33dfa1e06f (diff)
downloadlinux-stable-dcb706a93aa9d7974216ecbd57b6d632ffec31b6.tar.gz
linux-stable-dcb706a93aa9d7974216ecbd57b6d632ffec31b6.tar.bz2
linux-stable-dcb706a93aa9d7974216ecbd57b6d632ffec31b6.zip
dt-bindings: arm-smmu: Fix SC8280XP Adreno binding
[ Upstream commit 84b8a7fe29205016cffd4eff91b45830d318b53d ] The qcom,sc8280xp-smmu-500 Adreno SMMU binding has clocks, so fix up the binding to allow this. Fixes: 38db6b41b2f4 ("dt-bindings: arm-smmu: Add compatible for Qualcomm SC8280XP") Signed-off-by: Bjorn Andersson <quic_bjorande@quicinc.com> Acked-by: Conor Dooley <conor.dooley@microchip.com> Link: https://lore.kernel.org/r/20230523010441.63236-1-quic_bjorande@quicinc.com Signed-off-by: Will Deacon <will@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/iommu/arm,smmu.yaml6
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 ba677d401e24..6cb04f35642a 100644
--- a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml
+++ b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml
@@ -80,6 +80,7 @@ properties:
items:
- enum:
- qcom,sc7280-smmu-500
+ - qcom,sc8280xp-smmu-500
- qcom,sm6115-smmu-500
- qcom,sm6125-smmu-500
- qcom,sm8150-smmu-500
@@ -331,7 +332,9 @@ allOf:
properties:
compatible:
contains:
- const: qcom,sc7280-smmu-500
+ enum:
+ - qcom,sc7280-smmu-500
+ - qcom,sc8280xp-smmu-500
then:
properties:
clock-names:
@@ -416,7 +419,6 @@ allOf:
- qcom,sa8775p-smmu-500
- qcom,sc7180-smmu-500
- qcom,sc8180x-smmu-500
- - qcom,sc8280xp-smmu-500
- qcom,sdm670-smmu-500
- qcom,sdm845-smmu-500
- qcom,sdx55-smmu-500