Merge remote-tracking branch 'origin/develop-3.10-next' into develop-3.10

[firefly-linux-kernel-4.4.55.git] / drivers / media / video / rk_camsys / camsys_internal.h

diff --git a/drivers/media/video/rk_camsys/camsys_internal.h b/drivers/media/video/rk_camsys/camsys_internal.h
index f8b2a193c348a90408f070412789cd43a3f253ac..87d45670661f10c388be155eaca9f946001ad26e 100755 (executable)
--- a/drivers/media/video/rk_camsys/camsys_internal.h
+++ b/drivers/media/video/rk_camsys/camsys_internal.h
@@ -48,6 +48,7 @@
 #include <linux/of_gpio.h>
 #include <linux/rockchip/cpu.h>
 #include <media/camsys_head.h>
+#include <linux/rockchip-iovmm.h>
 
 
 
@@ -89,8 +90,10 @@
                 1) add flash_prelight control.         
 *v0.0x11.0:
          1) raise qos of isp up to the same as lcdc. 
+*v0.0x12.0:
+         1) support iommu. 
 */
-#define CAMSYS_DRIVER_VERSION                   KERNEL_VERSION(0,0x11,0)
+#define CAMSYS_DRIVER_VERSION                   KERNEL_VERSION(0,0x12,0)
 
 
 #define CAMSYS_PLATFORM_DRV_NAME                "RockChip-CamSys"
@@ -250,6 +253,7 @@ typedef struct camsys_dev_s {
     int (*iomux)(camsys_extdev_t *extdev,void *ptr);
     int (*platform_remove)(struct platform_device *pdev);
     int (*flash_trigger_cb)(void *ptr, unsigned int on);
+    int (*iommu_cb)(void *ptr,camsys_sysctrl_t *devctl);
 } camsys_dev_t;