Revert "iommu: rk-iovmm: change compatible name to a unified name"
authorHuang, Tao <huangtao@rock-chips.com>
Fri, 25 Mar 2016 10:01:06 +0000 (18:01 +0800)
committerGerrit Code Review <gerrit@rock-chips.com>
Fri, 25 Mar 2016 11:05:07 +0000 (19:05 +0800)
This reverts commit 3a1bdfa3a4bd6e3bb0a1328ef50a4d3278560222.

This patch broken old rkfb driver, so revert it.

Change-Id: I7ccd93d8ff2086cca9c1b31932278435cbffc59f

include/linux/rockchip-iovmm.h

index 8f2dd07474841947c8c3a6a0a83030d6ff3f0ba1..ab7f8bb61f0fe9df5202b315d2354c5f5c70d54e 100644 (file)
 #include <linux/atomic.h>
 #include <linux/spinlock.h>
 
-#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"
+#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"
 
 enum rk_iommu_inttype {
        IOMMU_PAGEFAULT,