From: Will Deacon <will@kernel.org>
Date: Thu, 24 Jul 2025 10:17:34 +0000 (+0100)
Subject: Merge branch 'samsung/exynos' into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab1de3f9c69d404dc499349bfc7293d19618eace;p=thirdparty%2Flinux.git

Merge branch 'samsung/exynos' into next

* samsung/exynos:
  iommu/exynos: add support for reserved regions
---

ab1de3f9c69d404dc499349bfc7293d19618eace
diff --cc drivers/iommu/exynos-iommu.c
index b62a8f35c3e85,f499861da1b16..b6edd178fe25e
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@@ -1479,6 -1478,8 +1480,7 @@@ static const struct iommu_ops exynos_io
  	.device_group = generic_device_group,
  	.probe_device = exynos_iommu_probe_device,
  	.release_device = exynos_iommu_release_device,
 -	.pgsize_bitmap = SECT_SIZE | LPAGE_SIZE | SPAGE_SIZE,
+ 	.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,