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

diff --git a/arch/arm/mach-rockchip/rk_camera.c b/arch/arm/mach-rockchip/rk_camera.c
index 467ec9470aaa08f1af6d90eba2e759758f47d248..f2408423cdbbd4fe8044a349acf229f99d558ef5 100644 (file)
--- a/arch/arm/mach-rockchip/rk_camera.c
+++ b/arch/arm/mach-rockchip/rk_camera.c
@@ -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!!!!!!");

diff --git a/drivers/media/video/rk30_camera_oneframe.c b/drivers/media/video/rk30_camera_oneframe.c
index 982872864bbfd14c64681e912dbcef29913322f9..efc65a36d9f1b3837f364b2671df6c7506a4d07a 100755 (executable)
--- a/drivers/media/video/rk30_camera_oneframe.c
+++ b/drivers/media/video/rk30_camera_oneframe.c
@@ -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);
 

diff --git a/drivers/media/video/rk_camsys/camsys_drv.c b/drivers/media/video/rk_camsys/camsys_drv.c
index 93bbab53a20011e989a12790983d6c61ec761b16..4232b242d8530c8dd38d964d1ecbf2a822459924 100755 (executable)
--- a/drivers/media/video/rk_camsys/camsys_drv.c
+++ b/drivers/media/video/rk_camsys/camsys_drv.c
@@ -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);

diff --git a/drivers/media/video/rk_camsys/camsys_internal.h b/drivers/media/video/rk_camsys/camsys_internal.h
index 5a66051a2c445a457c39feb46b95bd33843759fb..d89fc3dc7e11743590c0733ccef2487a07824ee6 100755 (executable)
--- a/drivers/media/video/rk_camsys/camsys_internal.h
+++ b/drivers/media/video/rk_camsys/camsys_internal.h
@@ -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"