Merge branch 'samsung/exynos' into next

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

diff --cc drivers/iommu/exynos-iommu.c
index b62a8f35c3e8516ead6a41f92dc7c8dc057986a8,f499861da1b166db8d3227df68138dd92bf6cb50..b6edd178fe25e7c258cc82c47e9170fb4db74064
--- 1/drivers/iommu/exynos-iommu.c
--- 2/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,