Merge tag 'iommu-updates-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

Pull IOMMU Updates from Joerg Roedel:
 "Besides some fixes and cleanups in the code there are three more
  important changes to point out this time:

	* New IOMMU driver for the ARM SHMOBILE platform
	* An IOMMU-API extension for non-paging IOMMUs (required for
	  upcoming PAMU driver)
	* Rework of the way the Tegra IOMMU driver accesses its
	  registetrs - register windows are easier to extend now.

  There are also a few changes to non-iommu code, but that is acked by
  the respective maintainers."

* tag 'iommu-updates-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (23 commits)
  iommu/tegra: assume CONFIG_OF in SMMU driver
  iommu/tegra: assume CONFIG_OF in gart driver
  iommu/amd: Remove redundant NULL check before dma_ops_domain_free().
  iommu/amd: Initialize device table after dma_ops
  iommu/vt-d: Zero out allocated memory in dmar_enable_qi
  iommu/tegra: smmu: Fix incorrect mask for regbase
  iommu/exynos: Make exynos_sysmmu_disable static
  ARM: mach-shmobile: r8a7740: Add IPMMU device
  ARM: mach-shmobile: sh73a0: Add IPMMU device
  ARM: mach-shmobile: sh7372: Add IPMMU device
  iommu/shmobile: Add iommu driver for Renesas IPMMU modules
  iommu: Add DOMAIN_ATTR_WINDOWS domain attribute
  iommu: Add domain window handling functions
  iommu: Implement DOMAIN_ATTR_PAGING attribute
  iommu: Check for valid pgsize_bitmap in iommu_map/unmap
  iommu: Make sure DOMAIN_ATTR_MAX is really the maximum
  iommu/tegra: smmu: Change SMMU's dependency on ARCH_TEGRA
  iommu/tegra: smmu: Use helper function to check for valid register offset
  iommu/tegra: smmu: Support variable MMIO ranges/blocks
  iommu/tegra: Add missing spinlock initialization
  ...

1 files changed, 30 insertions, 0 deletions

diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
index 973a06637572..acaeb14db54b 100644
--- a/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@ -109,6 +109,36 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = {
                                 "samsung-i2s.1", NULL),
         OF_DEV_AUXDATA("samsung,i2s-v5", 0x12D70000,
                                 "samsung-i2s.2", NULL),
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11210000,
+                        "exynos-sysmmu.0", "mfc"), /* MFC_L */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11200000,
+                        "exynos-sysmmu.1", "mfc"), /* MFC_R */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x14650000,
+                        "exynos-sysmmu.2", NULL), /* TV */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11F20000,
+                        "exynos-sysmmu.3", "jpeg"), /* JPEG */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11D40000,
+                        "exynos-sysmmu.4", NULL), /* ROTATOR */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13E80000,
+                        "exynos-sysmmu.5", "gscl"), /* GSCL0 */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13E90000,
+                        "exynos-sysmmu.6", "gscl"), /* GSCL1 */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13EA0000,
+                        "exynos-sysmmu.7", "gscl"), /* GSCL2 */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13EB0000,
+                        "exynos-sysmmu.8", "gscl"), /* GSCL3 */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13260000,
+                        "exynos-sysmmu.9", NULL), /* FIMC-IS0 */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x132C0000,
+                        "exynos-sysmmu.10", NULL), /* FIMC-IS1 */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x14640000,
+                        "exynos-sysmmu.11", NULL), /* FIMD1 */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13C40000,
+                        "exynos-sysmmu.12", NULL), /* FIMC-LITE0 */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13C50000,
+                        "exynos-sysmmu.13", NULL), /* FIMC-LITE1 */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x10A60000,
+                        "exynos-sysmmu.14", NULL), /* G2D */
         {},
 };