u1: import from CyanogenMod/android_kernel_samsung_smdk4210

Change-Id: I9629a4060538c9c4c6a43a86a56826cd7123d1b5

2 files changed, 7 insertions, 27 deletions

diff --git a/drivers/media/video/samsung/fimc/fimc_capture_u1.c b/drivers/media/video/samsung/fimc/fimc_capture_u1.c
index 1855abf..8a70bfe 100644
--- a/drivers/media/video/samsung/fimc/fimc_capture_u1.c
+++ b/drivers/media/video/samsung/fimc/fimc_capture_u1.c
@@ -264,9 +264,6 @@ retry:
 	}
 
 	/* subdev call for init */
-#if !defined(CONFIG_MACH_PX)
-	do_gettimeofday(&ctrl->before_time);
-#endif
 	if (ctrl->cap->fmt.priv == V4L2_PIX_FMT_MODE_CAPTURE) {
 		ret = v4l2_subdev_call(cam->sd, core, init, 1);
 		pixelformat = V4L2_PIX_FMT_JPEG;
@@ -1863,20 +1860,8 @@ int fimc_streamon_capture(void *fh)
 								STREAM_MODE_CAM_ON);
 					}
 				} else {
-					do_gettimeofday(&ctrl->curr_time);
-					inner_elapsed_usec = \
-						(ctrl->curr_time.tv_sec - ctrl->before_time.tv_sec) * USEC_PER_SEC \
-						+ ctrl->curr_time.tv_usec - ctrl->before_time.tv_usec;
-					inner_elapsed_usec = inner_elapsed_usec / 1000;
-
-					/* printk(KERN_INFO "\n\nfront cam stream off remain time = %dms\n",
-								inner_elapsed_usec);*/
-
-					if (150 > inner_elapsed_usec) {
-						/*printk(KERN_INFO "front cam stream off added msleep = %dms\n",
-							150 - inner_elapsed_usec);*/
-						msleep(150 - inner_elapsed_usec);
-					}
+					v4l2_subdev_call(cam->sd, video, s_stream,
+						STREAM_MODE_WAIT_OFF);
 				}
 #endif
 				if (cam->id == CAMERA_CSI_C) {
@@ -2035,10 +2020,11 @@ int fimc_streamoff_capture(void *fh)
 			STREAM_MODE_CAM_OFF);
 #endif /* CONFIG_VIDEO_IMPROVE_STREAMOFF */
 #else /* CONFIG_MACH_PX */
-	if (get_fimc_dev()->active_camera == 1)
-		v4l2_subdev_call(ctrl->cam->sd, video, s_stream, STREAM_MODE_CAM_OFF);
-
-	do_gettimeofday(&ctrl->before_time);
+	if (get_fimc_dev()->active_camera == 1) {
+		if ((ctrl->id != FIMC2) && (ctrl->cam->type == CAM_TYPE_MIPI))
+			v4l2_subdev_call(ctrl->cam->sd, video, s_stream,
+				STREAM_MODE_CAM_OFF);
+	}
 #endif
 
 	/* wait for stop hardware */
diff --git a/drivers/media/video/samsung/fimc/fimc_dev_u1.c b/drivers/media/video/samsung/fimc/fimc_dev_u1.c
index 762256b..811ac96 100644
--- a/drivers/media/video/samsung/fimc/fimc_dev_u1.c
+++ b/drivers/media/video/samsung/fimc/fimc_dev_u1.c
@@ -575,9 +575,6 @@ struct fimc_control *fimc_register_controller(struct platform_device *pdev)
 	ctrl->power_status = FIMC_POWER_OFF;
 
 	/* CMA */
-#ifdef CONFIG_ION_EXYNOS
-	if  (id != 2) {
-#endif
 		sprintf(ctrl->cma_name, "%s%d", FIMC_CMA_NAME, ctrl->id);
 	err = cma_info(&mem_info, ctrl->dev, 0);
 	fimc_info1("%s : [cma_info] start_addr : 0x%x, end_addr : 0x%x, "
@@ -593,9 +590,6 @@ struct fimc_control *fimc_register_controller(struct platform_device *pdev)
 		ctrl->mem.base = (dma_addr_t)cma_alloc
 			(ctrl->dev, ctrl->cma_name, (size_t)ctrl->mem.size, 0);
 	}
-#ifdef CONFIG_ION_EXYNOS
-	}
-#endif
 	printk(KERN_INFO "ctrl->mem.size = 0x%x\n", ctrl->mem.size);
 	printk(KERN_INFO "ctrl->mem.base = 0x%x\n", ctrl->mem.base);