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, 34 insertions, 0 deletions

diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c
index 112d10e53d20..3358088c822a 100644
--- a/arch/arm/mach-exynos/mach-exynos4-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@ -79,6 +79,40 @@ static const struct of_dev_auxdata exynos4_auxdata_lookup[] __initconst = {
         OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_MDMA1, "dma-pl330.2", NULL),
         OF_DEV_AUXDATA("samsung,exynos4210-tmu", EXYNOS4_PA_TMU,
                                 "exynos-tmu", NULL),
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13620000,
+                        "exynos-sysmmu.0", NULL), /* MFC_L */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13630000,
+                        "exynos-sysmmu.1", NULL), /* MFC_R */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13E20000,
+                        "exynos-sysmmu.2", NULL), /* TV */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11A60000,
+                        "exynos-sysmmu.3", NULL), /* JPEG */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x12A30000,
+                        "exynos-sysmmu.4", NULL), /* ROTATOR */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11A20000,
+                        "exynos-sysmmu.5", NULL), /* FIMC0 */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11A30000,
+                        "exynos-sysmmu.6", NULL), /* FIMC1 */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11A40000,
+                        "exynos-sysmmu.7", NULL), /* FIMC2 */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11A50000,
+                        "exynos-sysmmu.8", NULL), /* FIMC3 */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x12A20000,
+                        "exynos-sysmmu.9", NULL), /* G2D(4210) */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x10A40000,
+                        "exynos-sysmmu.9", NULL), /* G2D(4x12) */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11E20000,
+                        "exynos-sysmmu.10", NULL), /* FIMD0 */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x12220000,
+                        "exynos-sysmmu.11", NULL), /* FIMD1(4210) */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x12260000,
+                        "exynos-sysmmu.12", NULL), /* IS0(4x12) */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x122B0000,
+                        "exynos-sysmmu.13", NULL), /* IS1(4x12) */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x123B0000,
+                        "exynos-sysmmu.14", NULL), /* FIMC-LITE0(4x12) */
+        OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x123C0000,
+                        "exynos-sysmmu.15", NULL), /* FIMC-LITE1(4x12) */
         {},
 };