X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=drivers%2Fmedia%2Fvideo%2Fgc0309.c;h=7204463605d8d86a584d927e0a66cb2cca540836;hb=e82146650ea5de8205f8890eaf4cb98615c51d9a;hp=35a9a40f40d7bdb6b14c23caa76b35c954c7952f;hpb=9983901d21cae4402e9c01b91ee5df1a979207b7;p=firefly-linux-kernel-4.4.55.git

diff --git a/drivers/media/video/gc0309.c b/drivers/media/video/gc0309.c
index 35a9a40f40d7..7204463605d8 100755
--- a/drivers/media/video/gc0309.c
+++ b/drivers/media/video/gc0309.c
@@ -22,9 +22,9 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 #define SENSOR_NAME RK29_CAM_SENSOR_GC0309
 #define SENSOR_V4L2_IDENT V4L2_IDENT_GC0309
 #define SENSOR_ID 0xa0
-#define SENSOR_BUS_PARAM					 (SOCAM_MASTER |\
-											 SOCAM_PCLK_SAMPLE_RISING|SOCAM_HSYNC_ACTIVE_HIGH| SOCAM_VSYNC_ACTIVE_HIGH|\
-											 SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATAWIDTH_8  |SOCAM_MCLK_24MHZ)
+#define SENSOR_BUS_PARAM                     (V4L2_MBUS_MASTER |\
+													 V4L2_MBUS_PCLK_SAMPLE_RISING|V4L2_MBUS_HSYNC_ACTIVE_HIGH| V4L2_MBUS_VSYNC_ACTIVE_HIGH|\
+													 V4L2_MBUS_DATA_ACTIVE_HIGH  |SOCAM_MCLK_24MHZ)
 #define SENSOR_PREVIEW_W					 640
 #define SENSOR_PREVIEW_H					 480
 #define SENSOR_PREVIEW_FPS					 15000	   // 15fps 
@@ -862,7 +862,7 @@ static struct sensor_v4l2ctrl_usr_s sensor_controls[] =
 static struct rk_sensor_datafmt sensor_colour_fmts[] = {
 	{V4L2_MBUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_JPEG} 
 };
-static struct soc_camera_ops sensor_ops;
+/*static struct soc_camera_ops sensor_ops;*/
 
 
 /*