From: Simon <xxm@rock-chips.com>
Date: Tue, 22 Mar 2016 01:40:40 +0000 (+0800)
Subject: iommu: rk-iovmm: change compatible name to a unified name
X-Git-Tag: firefly_0821_release~3041
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3a1bdfa3a4bd6e3bb0a1328ef50a4d3278560222;p=firefly-linux-kernel-4.4.55.git

iommu: rk-iovmm: change compatible name to a unified name

To make android platform iommu work well, we need a unified compatible
name to match the new iommu definition in dtsi

Change-Id: Ied581653e1261fd0a21577f4e9ce3b915af135cd
Signed-off-by: Simon <xxm@rock-chips.com>
---

diff --git a/include/linux/rockchip-iovmm.h b/include/linux/rockchip-iovmm.h
index ab7f8bb61f0f..8f2dd0747484 100644
--- a/include/linux/rockchip-iovmm.h
+++ b/include/linux/rockchip-iovmm.h
@@ -11,15 +11,15 @@
 #include <linux/atomic.h>
 #include <linux/spinlock.h>
 
-#define IEP_IOMMU_COMPATIBLE_NAME "rockchip,iep_mmu"
-#define VIP_IOMMU_COMPATIBLE_NAME "rockchip,vip_mmu"
-#define ISP_IOMMU_COMPATIBLE_NAME "rockchip,isp_mmu"
-#define VOPB_IOMMU_COMPATIBLE_NAME "rockchip,vopb_mmu"
-#define VOPL_IOMMU_COMPATIBLE_NAME "rockchip,vopl_mmu"
-#define VOP_IOMMU_COMPATIBLE_NAME	"rockchip,vop_mmu"
-#define HEVC_IOMMU_COMPATIBLE_NAME "rockchip,hevc_mmu"
-#define VPU_IOMMU_COMPATIBLE_NAME "rockchip,vpu_mmu"
-#define VDEC_IOMMU_COMPATIBLE_NAME "rockchip,vdec_mmu"
+#define IEP_IOMMU_COMPATIBLE_NAME "rockchip,iommu"
+#define VIP_IOMMU_COMPATIBLE_NAME "rockchip,iommu"
+#define ISP_IOMMU_COMPATIBLE_NAME "rockchip,iommu"
+#define VOPB_IOMMU_COMPATIBLE_NAME "rockchip,iommu"
+#define VOPL_IOMMU_COMPATIBLE_NAME "rockchip,iommu"
+#define VOP_IOMMU_COMPATIBLE_NAME	"rockchip,iommu"
+#define HEVC_IOMMU_COMPATIBLE_NAME "rockchip,iommu"
+#define VPU_IOMMU_COMPATIBLE_NAME "rockchip,iommu"
+#define VDEC_IOMMU_COMPATIBLE_NAME "rockchip,iommu"
 
 enum rk_iommu_inttype {
 	IOMMU_PAGEFAULT,