camera: camsys_drv:v0.0x1b.0 oneframe:v0.1.0xd

diff --git a/arch/arm/mach-rockchip/rk_camera.c b/arch/arm/mach-rockchip/rk_camera.c
index f2408423cdbbd4fe8044a349acf229f99d558ef5..c79d50ebcbcb4612790cb398a801e1bc663ae1c4 100644 (file)
--- a/arch/arm/mach-rockchip/rk_camera.c
+++ b/arch/arm/mach-rockchip/rk_camera.c
@@ -349,11 +349,12 @@ 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, "rockchip,vpu_sub");
+    vpu_node = of_find_node_by_name(NULL, "vpu_service");
     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{
+       of_node_put(vpu_node);
+       }else{
                printk("get vpu_node failed,vpu_iommu_enabled == 0 !!!!!!\n");
 }
 

diff --git a/drivers/media/video/rk30_camera_oneframe.c b/drivers/media/video/rk30_camera_oneframe.c
index 9a238b5ce86af07741d7d93f1439bce0ba965f9e..9aa388a5f5499058212f752963c58efe21a9f487 100755 (executable)
--- a/drivers/media/video/rk30_camera_oneframe.c
+++ b/drivers/media/video/rk30_camera_oneframe.c
@@ -289,8 +289,10 @@ static u32 CHIP_NAME;
                 1. Vpu_service compatible has change ,fix it.
 *v0.1.c:
                 1. setting cif capture en bit can't stop cif really,reset cif instead.
+*v0.1.d:
+                1. use of_find_node_by_name to get vpu node instead of of_find_compatible_node 
 */
-#define RK_CAM_VERSION_CODE KERNEL_VERSION(0, 1, 0xc)
+#define RK_CAM_VERSION_CODE KERNEL_VERSION(0, 1, 0xd)
 static int version = RK_CAM_VERSION_CODE;
 module_param(version, int, S_IRUGO);
 

diff --git a/drivers/media/video/rk_camsys/camsys_drv.c b/drivers/media/video/rk_camsys/camsys_drv.c
index 4232b242d8530c8dd38d964d1ecbf2a822459924..d9e0e35b3a653d08462e1b164a107563e9d1bd37 100755 (executable)
--- a/drivers/media/video/rk_camsys/camsys_drv.c
+++ b/drivers/media/video/rk_camsys/camsys_drv.c
@@ -814,10 +814,11 @@ 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, "rockchip,vpu_sub");
+                vpu_node = of_find_node_by_name(NULL, "vpu_service");
                                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);
+                                       of_node_put(vpu_node);
                                        if(iommu_enabled != vpu_iommu_enabled){
                                                camsys_err("iommu status not consistent,check the dts file ! isp:%d,vpu:%d",iommu_enabled,vpu_iommu_enabled);
                                                return -EFAULT;

diff --git a/drivers/media/video/rk_camsys/camsys_internal.h b/drivers/media/video/rk_camsys/camsys_internal.h
index d89fc3dc7e11743590c0733ccef2487a07824ee6..6311637d99c27c412484b33cb2ae7c601739eb50 100755 (executable)
--- a/drivers/media/video/rk_camsys/camsys_internal.h
+++ b/drivers/media/video/rk_camsys/camsys_internal.h
@@ -110,8 +110,10 @@
          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"
+*v0.0x1b.0:
+                1) use of_find_node_by_name to get vpu node instead of of_find_compatible_node 
 */
-#define CAMSYS_DRIVER_VERSION                   KERNEL_VERSION(0,0x1a,0)
+#define CAMSYS_DRIVER_VERSION                   KERNEL_VERSION(0,0x1b,0)
 
 
 #define CAMSYS_PLATFORM_DRV_NAME                "RockChip-CamSys"