summaryrefslogtreecommitdiff
path: root/drivers/iommu
diff options
context:
space:
mode:
authorWill Deacon <will@kernel.org>2025-07-24 11:18:23 +0100
committerWill Deacon <will@kernel.org>2025-07-24 11:18:23 +0100
commitaaac6e2f9b647d1edf76e66d808af6c834fae877 (patch)
tree7c3f3acd1209ba610f5f443855e3687be47859df /drivers/iommu
parentc4e4c1fecc30cafddc3fc29c4faa2bf869df8a17 (diff)
parentac1207f516c2ffe082a5d8aad35ac839d6c60747 (diff)
downloadlinux-aaac6e2f9b647d1edf76e66d808af6c834fae877.tar.gz
linux-aaac6e2f9b647d1edf76e66d808af6c834fae877.tar.bz2
linux-aaac6e2f9b647d1edf76e66d808af6c834fae877.zip
Merge branch 'arm/smmu/bindings' into next
* arm/smmu/bindings: dt-bindings: arm-smmu: Remove sdm845-cheza specific entry dt-bindings: arm-smmu: document the support on Milos iommu/arm-smmu-qcom: Add SM6115 MDSS compatible
Diffstat (limited to 'drivers/iommu')
-rw-r--r--drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
index 62874b18f645..c75023718595 100644
--- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
@@ -379,6 +379,7 @@ static const struct of_device_id qcom_smmu_client_of_match[] __maybe_unused = {
{ .compatible = "qcom,sdm670-mdss" },
{ .compatible = "qcom,sdm845-mdss" },
{ .compatible = "qcom,sdm845-mss-pil" },
+ { .compatible = "qcom,sm6115-mdss" },
{ .compatible = "qcom,sm6350-mdss" },
{ .compatible = "qcom,sm6375-mdss" },
{ .compatible = "qcom,sm8150-mdss" },