rk: fb: 1.new intterupt set interface

	2.use macro from rockchip-iovmm.h instead of string to refer mmu compatible name

diff --git a/drivers/video/rockchip/lcdc/rk3288_lcdc.c b/drivers/video/rockchip/lcdc/rk3288_lcdc.c
index 7d6b9a210e0dee4b1510f32bb536e8a7c1379146..0f5b6c195690344815d0e75be4a64bbdbb23ddd6 100755 (executable)
--- a/drivers/video/rockchip/lcdc/rk3288_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk3288_lcdc.c
@@ -26,6 +26,7 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
+#include <linux/rockchip-iovmm.h>
 #include <asm/div64.h>
 #include <asm/uaccess.h>
 #include <linux/rockchip/cpu.h>
@@ -3611,9 +3612,9 @@ static int rk3288_lcdc_probe(struct platform_device *pdev)
 
        if (dev_drv->iommu_enabled) {
                if(lcdc_dev->id == 0){
-                       strcpy(dev_drv->mmu_dts_name, "iommu,vopb_mmu");
+                       strcpy(dev_drv->mmu_dts_name, VOPB_IOMMU_COMPATIBLE_NAME);
                }else{
-                       strcpy(dev_drv->mmu_dts_name, "iommu,vopl_mmu");
+                       strcpy(dev_drv->mmu_dts_name, VOPL_IOMMU_COMPATIBLE_NAME);
                }
        }
 

diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index d1bee87f6200bf809e1f5c424dcdbdc9f6029021..22f9134ca12160ad0769635d13c50dc7c2e5d886 100755 (executable)
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -49,8 +49,7 @@
 
 #if defined(CONFIG_ION_ROCKCHIP)
 #include <linux/rockchip_ion.h>
-#include <linux/rockchip/iovmm.h>
-#include <linux/rockchip/sysmmu.h>
+#include <linux/rockchip-iovmm.h>
 #include <linux/dma-buf.h>
 #include <linux/highmem.h>
 #endif
@@ -3668,7 +3667,7 @@ int rk_fb_register(struct rk_lcdc_driver *dev_drv,
                            rk_fb_get_sysmmu_device_by_compatible(dev_drv->mmu_dts_name);
                        if (mmu_dev) {
                                rk_fb_platform_set_sysmmu(mmu_dev, dev_drv->dev);
-                               rockchip_sysmmu_set_fault_handler(dev_drv->dev,
+                               rockchip_iovmm_set_fault_handler(dev_drv->dev,
                                                                  rk_fb_sysmmu_fault_handler);
                                rockchip_iovmm_activate(dev_drv->dev);
                        } else