summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Deacon <will@kernel.org>2025-07-24 11:17:34 +0100
committerWill Deacon <will@kernel.org>2025-07-24 11:17:34 +0100
commitab1de3f9c69d404dc499349bfc7293d19618eace (patch)
tree683945317c1b6716d8b528b0f7b2317f95ad3d34
parent6ed3d08a2220b12a13018ca7ef9e255f264327e8 (diff)
parent2d70fdd9b5c9a10c5a4b15179b425ff554b60c6d (diff)
Merge branch 'samsung/exynos' into next
* samsung/exynos: iommu/exynos: add support for reserved regions
-rw-r--r--drivers/iommu/exynos-iommu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index b62a8f35c3e8..b6edd178fe25 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -22,6 +22,7 @@
#include <linux/pm_runtime.h>
#include <linux/slab.h>
+#include "dma-iommu.h"
#include "iommu-pages.h"
typedef u32 sysmmu_iova_t;
@@ -1479,6 +1480,7 @@ static const struct iommu_ops exynos_iommu_ops = {
.device_group = generic_device_group,
.probe_device = exynos_iommu_probe_device,
.release_device = exynos_iommu_release_device,
+ .get_resv_regions = iommu_dma_get_resv_regions,
.of_xlate = exynos_iommu_of_xlate,
.default_domain_ops = &(const struct iommu_domain_ops) {
.attach_dev = exynos_iommu_attach_device,