iommu: move iommu header files to new locations

Header files are no longer allowed in the directory
arch/arm/mach-msm/include/mach/ .

Move the iommu related header files to a more suitable place.

Change-Id: Ib7bbce1485d6185f669935b507040cac75368985
Signed-off-by: Larry Bassel <lbassel@codeaurora.org>

40 files changed, 65 insertions, 64 deletions

diff --git a/drivers/gpu/msm/kgsl_iommu.h b/drivers/gpu/msm/kgsl_iommu.h
index bfe60427f110..82ebca35f677 100644
--- a/drivers/gpu/msm/kgsl_iommu.h
+++ b/drivers/gpu/msm/kgsl_iommu.h
@@ -13,7 +13,7 @@
 #ifndef __KGSL_IOMMU_H
 #define __KGSL_IOMMU_H
 
-#include <mach/iommu.h>
+#include <linux/qcom_iommu.h>
 
 /* Pagetable virtual base */
 #define KGSL_PAGETABLE_BASE     0x10000000
diff --git a/drivers/gpu/msm/kgsl_mmu.c b/drivers/gpu/msm/kgsl_mmu.c
index b753f6319136..7b81cfe642a1 100644
--- a/drivers/gpu/msm/kgsl_mmu.c
+++ b/drivers/gpu/msm/kgsl_mmu.c
@@ -18,7 +18,7 @@
 #include <linux/slab.h>
 #include <linux/sched.h>
 #include <linux/iommu.h>
-#include <mach/iommu.h>
+#include <linux/qcom_iommu.h>
 #include <linux/types.h>
 
 #include "kgsl.h"
diff --git a/drivers/gpu/msm/kgsl_mmu.h b/drivers/gpu/msm/kgsl_mmu.h
index 0fb3891e3749..b25d698c720f 100644
--- a/drivers/gpu/msm/kgsl_mmu.h
+++ b/drivers/gpu/msm/kgsl_mmu.h
@@ -13,7 +13,7 @@
 #ifndef __KGSL_MMU_H
 #define __KGSL_MMU_H
 
-#include <mach/iommu.h>
+#include <linux/qcom_iommu.h>
 #include "kgsl_iommu.h"
 /*
  * These defines control the address range for allocations that
diff --git a/drivers/iommu/msm_iommu-v0.c b/drivers/iommu/msm_iommu-v0.c
index da3b588ea4ae..bf5be0357834 100644
--- a/drivers/iommu/msm_iommu-v0.c
+++ b/drivers/iommu/msm_iommu-v0.c
@@ -27,10 +27,10 @@
 #include <asm/cacheflush.h>
 #include <asm/sizes.h>
 
-#include <mach/iommu_perfmon.h>
-#include <mach/iommu_hw-v0.h>
-#include <mach/msm_iommu_priv.h>
-#include <mach/iommu.h>
+#include "msm_iommu_perfmon.h"
+#include "msm_iommu_hw-v0.h"
+#include "msm_iommu_priv.h"
+#include <linux/qcom_iommu.h>
 #include <mach/msm_bus.h>
 
 #include <soc/qcom/smem.h>
diff --git a/drivers/iommu/msm_iommu-v1.c b/drivers/iommu/msm_iommu-v1.c
index 092abd58ef60..1455153159a9 100644
--- a/drivers/iommu/msm_iommu-v1.c
+++ b/drivers/iommu/msm_iommu-v1.c
@@ -29,12 +29,12 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/regulator/consumer.h>
+#include <linux/qcom_iommu.h>
 #include <asm/sizes.h>
 
-#include <mach/iommu_hw-v1.h>
-#include <mach/iommu.h>
-#include <mach/msm_iommu_priv.h>
-#include <mach/iommu_perfmon.h>
+#include "msm_iommu_hw-v1.h"
+#include "msm_iommu_priv.h"
+#include "msm_iommu_perfmon.h"
 #include "msm_iommu_pagetable.h"
 
 #ifdef CONFIG_IOMMU_LPAE
diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c
index facd2baed1d2..08d8d10da2c4 100644
--- a/drivers/iommu/msm_iommu.c
+++ b/drivers/iommu/msm_iommu.c
@@ -18,7 +18,7 @@
 #include <linux/platform_device.h>
 #include <linux/export.h>
 #include <linux/iommu.h>
-#include <mach/iommu.h>
+#include <linux/qcom_iommu.h>
 
 static DEFINE_MUTEX(iommu_list_lock);
 static LIST_HEAD(iommu_list);
diff --git a/drivers/iommu/msm_iommu_dev-v0.c b/drivers/iommu/msm_iommu_dev-v0.c
index bf3bf4b5e95f..702863a21e39 100644
--- a/drivers/iommu/msm_iommu_dev-v0.c
+++ b/drivers/iommu/msm_iommu_dev-v0.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-2014, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -27,9 +27,9 @@
 #include <linux/of_address.h>
 #include <linux/of_device.h>
 
-#include <mach/iommu_perfmon.h>
-#include <mach/iommu_hw-v0.h>
-#include <mach/iommu.h>
+#include "msm_iommu_perfmon.h"
+#include "msm_iommu_hw-v0.h"
+#include <linux/qcom_iommu.h>
 #include <mach/msm_bus.h>
 
 static struct of_device_id msm_iommu_v0_ctx_match_table[];
diff --git a/drivers/iommu/msm_iommu_dev-v1.c b/drivers/iommu/msm_iommu_dev-v1.c
index 88bb04b8749d..a3bb89a99e67 100644
--- a/drivers/iommu/msm_iommu_dev-v1.c
+++ b/drivers/iommu/msm_iommu_dev-v1.c
@@ -26,9 +26,9 @@
 #include <linux/of_address.h>
 #include <linux/of_device.h>
 
-#include <mach/iommu_hw-v1.h>
-#include <mach/iommu.h>
-#include <mach/iommu_perfmon.h>
+#include "msm_iommu_hw-v1.h"
+#include <linux/qcom_iommu.h>
+#include "msm_iommu_perfmon.h"
 
 static struct of_device_id msm_iommu_ctx_match_table[];
 
diff --git a/drivers/iommu/msm_iommu_domains.c b/drivers/iommu/msm_iommu_domains.c
index a6d39617d227..0a49e0b535e4 100644
--- a/drivers/iommu/msm_iommu_domains.c
+++ b/drivers/iommu/msm_iommu_domains.c
@@ -23,9 +23,9 @@
 #include <linux/idr.h>
 #include <asm/sizes.h>
 #include <asm/page.h>
-#include <mach/iommu.h>
+#include <linux/qcom_iommu.h>
 #include <linux/msm_iommu_domains.h>
-#include <mach/msm_iommu_priv.h>
+#include "msm_iommu_priv.h"
 #include <soc/qcom/socinfo.h>
 
 struct msm_iova_data {
diff --git a/arch/arm/mach-msm/include/mach/iommu_domains.h b/drivers/iommu/msm_iommu_domains.h
index 8f2ea0f6db46..8f2ea0f6db46 100644
--- a/arch/arm/mach-msm/include/mach/iommu_domains.h
+++ b/drivers/iommu/msm_iommu_domains.h
diff --git a/arch/arm/mach-msm/include/mach/iommu_hw-v0.h b/drivers/iommu/msm_iommu_hw-v0.h
index 68dec791a6f7..68dec791a6f7 100644
--- a/arch/arm/mach-msm/include/mach/iommu_hw-v0.h
+++ b/drivers/iommu/msm_iommu_hw-v0.h
diff --git a/arch/arm/mach-msm/include/mach/iommu_hw-v1.h b/drivers/iommu/msm_iommu_hw-v1.h
index 8d93edd9d42e..8d93edd9d42e 100644
--- a/arch/arm/mach-msm/include/mach/iommu_hw-v1.h
+++ b/drivers/iommu/msm_iommu_hw-v1.h
diff --git a/drivers/iommu/msm_iommu_pagetable.c b/drivers/iommu/msm_iommu_pagetable.c
index 5b423ac2f07a..f5ef73fc76c9 100644
--- a/drivers/iommu/msm_iommu_pagetable.c
+++ b/drivers/iommu/msm_iommu_pagetable.c
@@ -19,8 +19,8 @@
 
 #include <asm/cacheflush.h>
 
-#include <mach/iommu.h>
-#include <mach/msm_iommu_priv.h>
+#include <linux/qcom_iommu.h>
+#include "msm_iommu_priv.h"
 #include <trace/events/kmem.h>
 #include "msm_iommu_pagetable.h"
 
diff --git a/drivers/iommu/msm_iommu_pagetable_lpae.c b/drivers/iommu/msm_iommu_pagetable_lpae.c
index 9bc208617e1d..a1ef2050f3e1 100644
--- a/drivers/iommu/msm_iommu_pagetable_lpae.c
+++ b/drivers/iommu/msm_iommu_pagetable_lpae.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -17,7 +17,7 @@
 
 #include <asm/cacheflush.h>
 
-#include <mach/msm_iommu_priv.h>
+#include "msm_iommu_priv.h"
 #include <trace/events/kmem.h>
 #include "msm_iommu_pagetable.h"
 
diff --git a/drivers/iommu/msm_iommu_perfmon-v0.c b/drivers/iommu/msm_iommu_perfmon-v0.c
index b08a9ec11cbd..56666c38fb46 100644
--- a/drivers/iommu/msm_iommu_perfmon-v0.c
+++ b/drivers/iommu/msm_iommu_perfmon-v0.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -19,9 +19,9 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/device.h>
-#include <mach/iommu_hw-v0.h>
-#include <mach/iommu_perfmon.h>
-#include <mach/iommu.h>
+#include "msm_iommu_hw-v0.h"
+#include "msm_iommu_perfmon.h"
+#include <linux/qcom_iommu.h>
 
 #define PM_RESET_MASK		(0xF)
 #define PM_RESET_SHIFT		(0x8)
diff --git a/drivers/iommu/msm_iommu_perfmon-v1.c b/drivers/iommu/msm_iommu_perfmon-v1.c
index 2b551847581d..3bb8350e9587 100644
--- a/drivers/iommu/msm_iommu_perfmon-v1.c
+++ b/drivers/iommu/msm_iommu_perfmon-v1.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -18,9 +18,9 @@
 #include <linux/io.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
-#include <mach/iommu_hw-v1.h>
-#include <mach/iommu_perfmon.h>
-#include <mach/iommu.h>
+#include "msm_iommu_hw-v1.h"
+#include "msm_iommu_perfmon.h"
+#include <linux/qcom_iommu.h>
 
 #define PMCR_P_MASK		(0x1)
 #define PMCR_P_SHIFT		(1)
diff --git a/drivers/iommu/msm_iommu_perfmon.c b/drivers/iommu/msm_iommu_perfmon.c
index 503d4ab13a27..9915d6b19169 100644
--- a/drivers/iommu/msm_iommu_perfmon.c
+++ b/drivers/iommu/msm_iommu_perfmon.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -20,8 +20,8 @@
 #include <linux/interrupt.h>
 #include <linux/bitops.h>
 #include <linux/debugfs.h>
-#include <mach/iommu.h>
-#include <mach/iommu_perfmon.h>
+#include <linux/qcom_iommu.h>
+#include "msm_iommu_perfmon.h"
 
 static LIST_HEAD(iommu_list);
 static struct dentry *msm_iommu_root_debugfs_dir;
diff --git a/arch/arm/mach-msm/include/mach/iommu_perfmon.h b/drivers/iommu/msm_iommu_perfmon.h
index 45683f4ebd88..45683f4ebd88 100644
--- a/arch/arm/mach-msm/include/mach/iommu_perfmon.h
+++ b/drivers/iommu/msm_iommu_perfmon.h
diff --git a/arch/arm/mach-msm/include/mach/msm_iommu_priv.h b/drivers/iommu/msm_iommu_priv.h
index 179e02157a90..179e02157a90 100644
--- a/arch/arm/mach-msm/include/mach/msm_iommu_priv.h
+++ b/drivers/iommu/msm_iommu_priv.h
diff --git a/drivers/iommu/msm_iommu_sec.c b/drivers/iommu/msm_iommu_sec.c
index 38706a5ee7f6..5fca9e5eae5b 100644
--- a/drivers/iommu/msm_iommu_sec.c
+++ b/drivers/iommu/msm_iommu_sec.c
@@ -31,10 +31,10 @@
 #include <asm/cacheflush.h>
 #include <asm/sizes.h>
 
-#include <mach/iommu_perfmon.h>
-#include <mach/iommu_hw-v1.h>
-#include <mach/msm_iommu_priv.h>
-#include <mach/iommu.h>
+#include "msm_iommu_perfmon.h"
+#include "msm_iommu_hw-v1.h"
+#include "msm_iommu_priv.h"
+#include <linux/qcom_iommu.h>
 
 /* bitmap of the page sizes currently supported */
 #define MSM_IOMMU_PGSIZES	(SZ_4K | SZ_64K | SZ_1M | SZ_16M)
diff --git a/drivers/media/platform/msm/broadcast/ensigma_uccp330.c b/drivers/media/platform/msm/broadcast/ensigma_uccp330.c
index 5c2b9fd682d1..d0bc94ebec09 100644
--- a/drivers/media/platform/msm/broadcast/ensigma_uccp330.c
+++ b/drivers/media/platform/msm/broadcast/ensigma_uccp330.c
@@ -41,8 +41,9 @@
 #include <mach/msm_bus.h>
 #include <linux/clk/msm-clk.h>
 #include <linux/iommu.h>
-#include <mach/iommu.h>
-#include <mach/iommu_domains.h>
+#include <linux/qcom_iommu.h>
+#include <linux/msm_iommu_domains.h>
+
 #define DRV_NAME_DEMOD "demod"
 #define DRVDBG(fmt, args...)\
 	pr_debug(DRV_NAME_DEMOD " %s():%d " fmt, __func__, __LINE__, ## args)
diff --git a/drivers/media/platform/msm/broadcast/tspp2.c b/drivers/media/platform/msm/broadcast/tspp2.c
index 01568fdd51d7..343ce6809898 100644
--- a/drivers/media/platform/msm/broadcast/tspp2.c
+++ b/drivers/media/platform/msm/broadcast/tspp2.c
@@ -27,7 +27,7 @@
 #include <linux/mutex.h>
 #include <linux/workqueue.h>
 #include <linux/iommu.h>
-#include <mach/iommu.h>
+#include <linux/qcom_iommu.h>
 #include <linux/msm_iommu_domains.h>
 #include <mach/msm_bus.h>
 #include <mach/msm_tspp2.h>
diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c b/drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c
index b2689a442429..e902d3823d78 100644
--- a/drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c
+++ b/drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c
@@ -29,7 +29,7 @@
 #include <media/msm_camera.h>
 #include <media/msm_isp.h>
 
-#include <mach/iommu.h>
+#include <linux/qcom_iommu.h>
 
 #include "msm.h"
 #include "msm_buf_mgr.h"
diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp.c
index aaba5c62936f..6c3a3f40f242 100644
--- a/drivers/media/platform/msm/camera_v2/isp/msm_isp.c
+++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp.c
@@ -18,11 +18,11 @@
 #include <linux/debugfs.h>
 #include <linux/videodev2.h>
 #include <linux/of_device.h>
+#include <linux/qcom_iommu.h>
 #include <media/v4l2-subdev.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-event.h>
-#include <mach/iommu.h>
 
 #include "msm_isp.h"
 #include "msm_isp_util.h"
diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp32.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp32.c
index a1e6a9747ef9..b9eed958d9e2 100644
--- a/drivers/media/platform/msm/camera_v2/isp/msm_isp32.c
+++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp32.c
@@ -12,7 +12,7 @@
 
 #include <linux/module.h>
 #include <linux/platform_device.h>
-#include <mach/iommu.h>
+#include <linux/qcom_iommu.h>
 
 #include "msm_isp32.h"
 #include "msm_isp_util.h"
diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp40.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp40.c
index 8bd15f102869..12ea2b967ba5 100644
--- a/drivers/media/platform/msm/camera_v2/isp/msm_isp40.c
+++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp40.c
@@ -11,7 +11,7 @@
  */
 
 #include <linux/module.h>
-#include <mach/iommu.h>
+#include <linux/qcom_iommu.h>
 #include <linux/ratelimit.h>
 
 #include "msm_isp40.h"
diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp44.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp44.c
index d76f6ec6ce67..3dec88017ec5 100644
--- a/drivers/media/platform/msm/camera_v2/isp/msm_isp44.c
+++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp44.c
@@ -11,7 +11,7 @@
  */
 
 #include <linux/module.h>
-#include <mach/iommu.h>
+#include <linux/qcom_iommu.h>
 #include <linux/ratelimit.h>
 
 #include "msm_isp44.h"
diff --git a/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_platform.c b/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_platform.c
index 0fbe21e87bdc..10232ea5beb9 100644
--- a/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_platform.c
+++ b/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_platform.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -21,6 +21,7 @@
 #include <linux/msm-bus.h>
 #include <linux/msm-bus-board.h>
 #include <linux/msm_ion.h>
+#include <linux/iommu.h>
 
 #include "msm_jpeg_platform.h"
 #include "msm_jpeg_sync.h"
diff --git a/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_platform.h b/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_platform.h
index ea436d0a58a4..b59c41f8780c 100644
--- a/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_platform.h
+++ b/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_platform.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -16,8 +16,7 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/ion.h>
-#include <linux/iommu.h>
-#include <mach/iommu.h>
+#include <linux/qcom_iommu.h>
 #include "msm_jpeg_sync.h"
 #define JPEG_CLK_RATE 266670000
 
diff --git a/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c b/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c
index 95b70e06b011..b777aec8f7b3 100644
--- a/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c
+++ b/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c
@@ -29,7 +29,7 @@
 #include <linux/workqueue.h>
 #include <linux/msm_iommu_domains.h>
 #include <linux/clk/msm-clk.h>
-#include <mach/iommu.h>
+#include <linux/qcom_iommu.h>
 #include <mach/vreg.h>
 #include <media/msm_isp.h>
 #include <media/v4l2-event.h>
diff --git a/drivers/media/platform/msm/camera_v2/pproc/vpe/msm_vpe.c b/drivers/media/platform/msm/camera_v2/pproc/vpe/msm_vpe.c
index 8e43553f9d8b..dd0e8afeb42b 100644
--- a/drivers/media/platform/msm/camera_v2/pproc/vpe/msm_vpe.c
+++ b/drivers/media/platform/msm/camera_v2/pproc/vpe/msm_vpe.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -18,7 +18,7 @@
 #include <linux/msm_ion.h>
 #include <linux/iommu.h>
 #include <linux/msm_iommu_domains.h>
-#include <mach/iommu.h>
+#include <linux/qcom_iommu.h>
 #include <media/v4l2-dev.h>
 #include <media/v4l2-event.h>
 #include <media/v4l2-fh.h>
diff --git a/drivers/media/platform/msm/vidc/msm_v4l2_vidc.c b/drivers/media/platform/msm/vidc/msm_v4l2_vidc.c
index 4c6642ef08f7..542f7bb46cd0 100644
--- a/drivers/media/platform/msm/vidc/msm_v4l2_vidc.c
+++ b/drivers/media/platform/msm/vidc/msm_v4l2_vidc.c
@@ -21,7 +21,7 @@
 #include <linux/version.h>
 #include <linux/slab.h>
 #include <mach/board.h>
-#include <mach/iommu.h>
+#include <linux/qcom_iommu.h>
 #include <linux/msm_iommu_domains.h>
 #include <media/msm_vidc.h>
 #include "msm_vidc_internal.h"
diff --git a/drivers/media/platform/msm/vidc/venus_hfi.c b/drivers/media/platform/msm/vidc/venus_hfi.c
index e47e4a297c8c..8c1b6ab36a57 100644
--- a/drivers/media/platform/msm/vidc/venus_hfi.c
+++ b/drivers/media/platform/msm/vidc/venus_hfi.c
@@ -18,9 +18,9 @@
 #include <linux/delay.h>
 #include <linux/of.h>
 #include <linux/iommu.h>
+#include <linux/qcom_iommu.h>
 #include <soc/qcom/subsystem_restart.h>
 #include <soc/qcom/scm.h>
-#include <mach/iommu.h>
 #include <linux/msm_iommu_domains.h>
 #include <mach/ocmem.h>
 #include <soc/qcom/smem.h>
diff --git a/drivers/media/platform/msm/vpu/vpu_resources.c b/drivers/media/platform/msm/vpu/vpu_resources.c
index fec9c7277a48..4801ccffb834 100644
--- a/drivers/media/platform/msm/vpu/vpu_resources.c
+++ b/drivers/media/platform/msm/vpu/vpu_resources.c
@@ -15,7 +15,7 @@
 
 #include <linux/msm_ion.h>
 #include <linux/iommu.h>
-#include <mach/iommu.h>
+#include <linux/qcom_iommu.h>
 #include <linux/msm_iommu_domains.h>
 #include <mach/msm_bus_board.h>
 #include <asm-generic/sizes.h>
diff --git a/drivers/video/msm/mdss/mdp3.c b/drivers/video/msm/mdss/mdp3.c
index 93c0f2b86bfa..6d548bafcf6b 100644
--- a/drivers/video/msm/mdss/mdp3.c
+++ b/drivers/video/msm/mdss/mdp3.c
@@ -44,7 +44,7 @@
 #include <mach/hardware.h>
 #include <mach/msm_bus.h>
 #include <mach/msm_bus_board.h>
-#include <mach/iommu.h>
+#include <linux/qcom_iommu.h>
 #include <linux/msm_iommu_domains.h>
 #include <mach/msm_memtypes.h>
 
diff --git a/drivers/video/msm/mdss/mdss_fb.c b/drivers/video/msm/mdss/mdss_fb.c
index 684d405ce163..54796863b712 100644
--- a/drivers/video/msm/mdss/mdss_fb.c
+++ b/drivers/video/msm/mdss/mdss_fb.c
@@ -48,7 +48,7 @@
 
 #include <mach/board.h>
 #include <mach/memory.h>
-#include <mach/iommu.h>
+#include <linux/qcom_iommu.h>
 #include <linux/msm_iommu_domains.h>
 #include <mach/msm_memtypes.h>
 
diff --git a/drivers/video/msm/mdss/mdss_mdp.c b/drivers/video/msm/mdss/mdss_mdp.c
index 204be6bf03dd..63bb1cc24479 100644
--- a/drivers/video/msm/mdss/mdss_mdp.c
+++ b/drivers/video/msm/mdss/mdss_mdp.c
@@ -45,7 +45,7 @@
 #include <mach/hardware.h>
 #include <mach/msm_bus.h>
 #include <mach/msm_bus_board.h>
-#include <mach/iommu.h>
+#include <linux/qcom_iommu.h>
 #include <linux/msm_iommu_domains.h>
 #include <mach/memory.h>
 #include <mach/msm_memtypes.h>
diff --git a/drivers/video/msm/mdss/mdss_mdp_util.c b/drivers/video/msm/mdss/mdss_mdp_util.c
index 7045cd76887b..255d4d6eae10 100644
--- a/drivers/video/msm/mdss/mdss_mdp_util.c
+++ b/drivers/video/msm/mdss/mdss_mdp_util.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -16,7 +16,7 @@
 #include <linux/errno.h>
 #include <linux/file.h>
 #include <linux/msm_ion.h>
-#include <linux/iommu.h>
+#include <linux/qcom_iommu.h>
 #include <linux/msm_kgsl.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
diff --git a/drivers/video/msm/mdss/mdss_mdp_wb.c b/drivers/video/msm/mdss/mdss_mdp_wb.c
index 9d0e6b0c7b55..aab2c5d1e03e 100644
--- a/drivers/video/msm/mdss/mdss_mdp_wb.c
+++ b/drivers/video/msm/mdss/mdss_mdp_wb.c
@@ -20,7 +20,7 @@
 #include <linux/uaccess.h>
 #include <linux/iommu.h>
 
-#include <mach/iommu.h>
+#include <linux/qcom_iommu.h>
 #include <linux/msm_iommu_domains.h>
 
 #include "mdss_mdp.h"
diff --git a/arch/arm/mach-msm/include/mach/iommu.h b/include/linux/qcom_iommu.h
index 6b07b6326625..6b07b6326625 100644
--- a/arch/arm/mach-msm/include/mach/iommu.h
+++ b/include/linux/qcom_iommu.h