camera: fix ov2659 delay 600ms after capture and pmem allocate for 0.3 Mega

diff --git a/drivers/media/video/ov2659.c b/drivers/media/video/ov2659.c
index 30fc9c7b58dfe55c62053ba9b66c62ce4cb6a491..5a45a36de5f6cbafafbfedb3de18ca4f484fea01 100755 (executable)
--- 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 d55043daba2f820f4713073ba4ae2b6427d2f0e5..04e6df1d3a1e7897934ced922c3f940f8a62d919 100755 (executable)
--- a/drivers/media/video/rk29_camera.c
+++ b/drivers/media/video/rk29_camera.c
@@ -45,7 +45,11 @@
 #define PMEM_CAM_NECESSARY   0xc00000\r
 #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) */\r
-#endif
+#elif (PMEM_CAM_FULL_RESOLUTION == 0x30000)\r
+#define PMEM_CAM_NECESSARY   0x400000        /* 640*480*1.5*4(preview) + 1M(capture raw) + 1M(jpeg encode output) */\r
+#else\r
+#define PMEM_CAM_NECESSARY   0x1200000\r
+#endif\r
 /*---------------- Camera Sensor Fixed Macro End  ------------------------*/\r
 #else   //#ifdef CONFIG_VIDEO_RK29 \r
 #define PMEM_CAM_NECESSARY   0x00000000\r