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

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-rockchip / rk_camera.c

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