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

camera: camsys_drv:v0.0x1a.0 oneframe:v0.1.0xb

Browse Source
This commit is contained in:
zyc
2015-01-13 10:54:55 +08:00
parent 018e850fee
commit c689bbd0c3
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-rockchip/rk_camera.c
View File

@@ -349,11 +349,13 @@ static int rk_dts_cif_probe(struct platform_device *pdev) /*yzm*/
err = of_property_read_string(dev->of_node->parent,"compatible",&compatible);
rk_camera_platform_data.rockchip_name = compatible;
vpu_node = of_find_compatible_node(NULL,NULL, "vpu_service");
vpu_node = of_find_compatible_node(NULL,NULL, "rockchip,vpu_sub");
if(vpu_node){
err = of_property_read_u32(vpu_node, "iommu_enabled", &vpu_iommu_enabled);
rk_camera_platform_data.iommu_enabled = vpu_iommu_enabled;
}
}else{
printk("get vpu_node failed,vpu_iommu_enabled == 0 !!!!!!\n");
}
if (err < 0){
printk(KERN_EMERG "Get rockchip compatible failed!!!!!!");

4
drivers/media/video/rk30_camera_oneframe.c
View File

@@ -285,8 +285,10 @@ static u32 CHIP_NAME;
*v0.1.a:
1. Support rk3288 cif driver
2. Query and upload iommu info
*v0.1.b:
1. Vpu_service compatible has change ,fix it.
*/
#define RK_CAM_VERSION_CODE KERNEL_VERSION(0, 1, 0xa)
#define RK_CAM_VERSION_CODE KERNEL_VERSION(0, 1, 0xb)
static int version = RK_CAM_VERSION_CODE;
module_param(version, int, S_IRUGO);

2
drivers/media/video/rk_camsys/camsys_drv.c
View File

@@ -814,7 +814,7 @@ static long camsys_ioctl(struct file *filp,unsigned int cmd, unsigned long arg)
#ifdef CONFIG_ROCKCHIP_IOMMU
struct device_node * vpu_node =NULL;
int vpu_iommu_enabled = 0;
vpu_node = of_find_compatible_node(NULL,NULL, "vpu_service");
vpu_node = of_find_compatible_node(NULL,NULL, "rockchip,vpu_sub");
if(vpu_node){
of_property_read_u32(vpu_node, "iommu_enabled", &vpu_iommu_enabled);
of_property_read_u32(camsys_dev->pdev->dev.of_node, "rockchip,isp,iommu_enable", &iommu_enabled);

4
drivers/media/video/rk_camsys/camsys_internal.h
View File

@@ -108,8 +108,10 @@
2) support torch mode
*v0.0x19.0:
1) set CONFIG_CAMSYS_DRV disable as default,enable in defconfig file if needed.
*v0.0x1a.0:
1) vpu_node changed from "vpu_service" to "rockchip,vpu_sub"
*/
#define CAMSYS_DRIVER_VERSION KERNEL_VERSION(0,0x19,0)
#define CAMSYS_DRIVER_VERSION KERNEL_VERSION(0,0x1a,0)
#define CAMSYS_PLATFORM_DRV_NAME "RockChip-CamSys"