shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 11:50:43 +09:00
Code Issues Packages Projects Releases Wiki Activity

rk: fb: 1.new intterupt set interface

Browse Source 
2.use macro from rockchip-iovmm.h instead of string to refer mmu compatible name
This commit is contained in:
xxm
2014-08-08 11:13:52 +08:00
parent 137fa35772
commit 383202d8d4
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/video/rockchip/lcdc/rk3288_lcdc.c
View File

@@ -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);
}
}

5
drivers/video/rockchip/rk_fb.c
View File

@@ -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