From 194bd0355a65c0d2491d8cd82a191a0884790de2 Mon Sep 17 00:00:00 2001 From: ddl Date: Tue, 19 Jul 2011 11:16:15 +0800 Subject: [PATCH] camera: fix ov2659 delay 600ms after capture and pmem allocate for 0.3 Mega --- drivers/media/video/ov2659.c | 1 + drivers/media/video/rk29_camera.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/media/video/ov2659.c b/drivers/media/video/ov2659.c index 30fc9c7b58df..5a45a36de5f6 100755 --- a/drivers/media/video/ov2659.c +++ b/drivers/media/video/ov2659.c @@ -1898,6 +1898,7 @@ static int sensor_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f) sensor_set_effect(icd, qctrl,sensor->info_priv.effect); qctrl = soc_camera_find_qctrl(&sensor_ops, V4L2_CID_DO_WHITE_BALANCE); sensor_set_whiteBalance(icd, qctrl,sensor->info_priv.whiteBalance); + msleep(600); sensor->info_priv.video2preview = false; sensor->info_priv.snap2preview = false; } diff --git a/drivers/media/video/rk29_camera.c b/drivers/media/video/rk29_camera.c index d55043daba2f..04e6df1d3a1e 100755 --- a/drivers/media/video/rk29_camera.c +++ b/drivers/media/video/rk29_camera.c @@ -45,7 +45,11 @@ #define PMEM_CAM_NECESSARY 0xc00000 #elif ((PMEM_CAM_FULL_RESOLUTION == 0x100000) || (PMEM_CAM_FULL_RESOLUTION == 0x130000)) #define PMEM_CAM_NECESSARY 0x800000 /* 800*600*1.5*4(preview) + 2M(capture raw) + 2M(jpeg encode output) */ -#endif +#elif (PMEM_CAM_FULL_RESOLUTION == 0x30000) +#define PMEM_CAM_NECESSARY 0x400000 /* 640*480*1.5*4(preview) + 1M(capture raw) + 1M(jpeg encode output) */ +#else +#define PMEM_CAM_NECESSARY 0x1200000 +#endif /*---------------- Camera Sensor Fixed Macro End ------------------------*/ #else //#ifdef CONFIG_VIDEO_RK29 #define PMEM_CAM_NECESSARY 0x00000000 -- 2.34.1