camsys_drv: v0.0x16.0

diff --git a/drivers/media/video/rk_camsys/camsys_drv.c b/drivers/media/video/rk_camsys/camsys_drv.c
index 049492f9fa0a861b7090aa4ceab6c098e43dd6c8..4edcf457b81bace1de54bd7d56db50e61c4f2757 100755 (executable)
--- a/drivers/media/video/rk_camsys/camsys_drv.c
+++ b/drivers/media/video/rk_camsys/camsys_drv.c
@@ -790,8 +790,9 @@ static long camsys_ioctl(struct file *filp,unsigned int cmd, unsigned long arg)
            {
             int iommu_enabled = 0;
             #ifdef CONFIG_ROCKCHIP_IOMMU
-                of_property_read_u32(camsys_dev->pdev->dev.of_node, "rockchip,isp,iommu_enable", &iommu_enabled);
-            #endif
+                //of_property_read_u32(camsys_dev->pdev->dev.of_node, "rockchip,isp,iommu_enable", &iommu_enabled);
+               iommu_enabled = 1;
+                       #endif
             if (copy_to_user((void __user *)arg,(void*)&iommu_enabled, sizeof(iommu_enabled)))
                 return -EFAULT;
             break;

diff --git a/drivers/media/video/rk_camsys/camsys_internal.h b/drivers/media/video/rk_camsys/camsys_internal.h
index fd46812c18933d80bf9538601290e99f500e4cea..02995906f1f7ce5650433556ee41bddd356e7e20 100755 (executable)
--- a/drivers/media/video/rk_camsys/camsys_internal.h
+++ b/drivers/media/video/rk_camsys/camsys_internal.h
@@ -99,8 +99,10 @@
          1) camsys_extdev_register return -EBUSY when this dev_id has been registered;
 *v0.0x15.0:
          1) check extdev name when dev_id has been registered;
+*v0.0x16.0:
+                1) enable or disable IOMMU just depending on CONFIG_ROCKCHIP_IOMMU. 
 */
-#define CAMSYS_DRIVER_VERSION                   KERNEL_VERSION(0,0x15,0)
+#define CAMSYS_DRIVER_VERSION                   KERNEL_VERSION(0,0x16,0)
 
 
 #define CAMSYS_PLATFORM_DRV_NAME                "RockChip-CamSys"

diff --git a/drivers/media/video/rk_camsys/camsys_marvin.c b/drivers/media/video/rk_camsys/camsys_marvin.c
index a3bf12e4f31d60ae4e1706bbc65347e22bfe75d1..94d856f774f54c35e42720de401a9b1f2feae535 100755 (executable)
--- a/drivers/media/video/rk_camsys/camsys_marvin.c
+++ b/drivers/media/video/rk_camsys/camsys_marvin.c
@@ -237,16 +237,17 @@ static int camsys_mrv_iommu_cb(void *ptr,camsys_sysctrl_t *devctl)
     struct ion_client *client = NULL;
     struct ion_handle *handle = NULL;
     camsys_iommu_t *iommu = NULL;
-    int ret = 0,iommu_enabled = 0;
+    int ret = 0;
     camsys_dev_t * camsys_dev = (camsys_dev_t *)ptr;
 
+#if 0
     of_property_read_u32(camsys_dev->pdev->dev.of_node, "rockchip,isp,iommu_enable", &iommu_enabled);
     if(iommu_enabled != 1){
         camsys_err("isp iommu have not been enabled!\n");
         ret = -1;
         goto iommu_end;
     }
-    
+#endif
     iommu_dev = rockchip_get_sysmmu_device_by_compatible(ISP_IOMMU_COMPATIBLE_NAME);
     if(!iommu_dev){
         camsys_err("get iommu device erro!\n");