rk312x camera : oneframe v0.1.9,pingpong v0.1.9

[firefly-linux-kernel-4.4.55.git] / drivers / media / video / gc0308.c

diff --git a/drivers/media/video/gc0308.c b/drivers/media/video/gc0308.c
index 5c3525f5d08d40d1cd731f5d40007b5a59d58c51..93d78ec88e51b6eb8d67ce822ec932808f5d97eb 100755 (executable)
--- a/drivers/media/video/gc0308.c
+++ b/drivers/media/video/gc0308.c
@@ -22,9 +22,9 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 #define SENSOR_NAME RK29_CAM_SENSOR_GC0308\r
 #define SENSOR_V4L2_IDENT V4L2_IDENT_GC0308\r
 #define SENSOR_ID 0x9b\r
-#define SENSOR_BUS_PARAM                                        (SOCAM_MASTER |\\r
-                                                                                        SOCAM_PCLK_SAMPLE_RISING|SOCAM_HSYNC_ACTIVE_HIGH| SOCAM_VSYNC_ACTIVE_LOW|\\r
-                                                                                        SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATAWIDTH_8  |SOCAM_MCLK_24MHZ)\r
+#define SENSOR_BUS_PARAM                     (V4L2_MBUS_MASTER |\\r
+                                                                                                        V4L2_MBUS_PCLK_SAMPLE_RISING|V4L2_MBUS_HSYNC_ACTIVE_HIGH| V4L2_MBUS_VSYNC_ACTIVE_LOW|\\r
+                                                                                                        V4L2_MBUS_DATA_ACTIVE_HIGH  |SOCAM_MCLK_24MHZ)\r
 #define SENSOR_PREVIEW_W                                        640\r
 #define SENSOR_PREVIEW_H                                        480\r
 #define SENSOR_PREVIEW_FPS                                      15000     // 15fps \r
@@ -912,7 +912,7 @@ static struct sensor_v4l2ctrl_usr_s sensor_controls[] =
 static struct rk_sensor_datafmt sensor_colour_fmts[] = {\r
        {V4L2_MBUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_JPEG} \r
 };\r
-static struct soc_camera_ops sensor_ops;\r
+/*static struct soc_camera_ops sensor_ops;*/\r
 \r
 \r
 /*\r